make sure empty port is parsed correctly on both targets

Author: giacomocavalieri

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 - The performance of the `string.repeat` function has been improved. It now runs
   in loglinear time.
+- Fixed a bug in the `uri.parse` function where parsing a uri with an empty port
+  would produce an invalid value.
 
 ## v0.62.1 - 2025-08-07
 

src/gleam/uri.gleam

@@ -363,20 +363,23 @@ fn parse_port(uri_string: String, pieces: Uri) -> Result(Uri, Nil) {
     ":8" <> rest -> parse_port_loop(rest, pieces, 8)
     ":9" <> rest -> parse_port_loop(rest, pieces, 9)
 
-    // It means the port segment is not composed of numbers, the port is invalid
-    // and so is the uri!
-    ":" <> _ -> Error(Nil)
+    // The port could be empty and be followed by any of the next delimiters.
+    // Like `:#`, `:?` or `:/`
+    ":" | "" -> Ok(pieces)
 
     // `?` marks the beginning of the query with question mark.
-    "?" <> rest -> parse_query_with_question_mark(rest, pieces)
+    "?" <> rest | ":?" <> rest -> parse_query_with_question_mark(rest, pieces)
 
     // `#` marks the beginning of the fragment part.
-    "#" <> rest -> parse_fragment(rest, pieces)
+    "#" <> rest | ":#" <> rest -> parse_fragment(rest, pieces)
 
     // `/` marks the beginning of a path.
     "/" <> _ -> parse_path(uri_string, pieces)
-
-    "" -> Ok(pieces)
+    ":" <> rest ->
+      case rest {
+        "/" <> _ -> parse_path(rest, pieces)
+        _ -> Error(Nil)
+      }
 
     _ -> Error(Nil)
   }

src/gleam_stdlib.erl

@@ -33,7 +33,7 @@
         (X == 95)).
 -define(is_digit_char(X),
         (X > 47 andalso X < 58)).
--define(is_ascii_character(X), 
+-define(is_ascii_character(X),
         (erlang:is_integer(X) andalso X >= 32 andalso X =< 126)).
 
 uppercase(X) -> X - 32.
@@ -229,11 +229,17 @@ uri_parse(String) ->
     case uri_string:parse(String) of
         {error, _, _} -> {error, nil};
         Uri ->
+            Port =
+                try maps:get(port, Uri) of
+                    undefined -> none;
+                    Value -> {some, Value}
+                catch _:_ -> none
+                end,
             {ok, {uri,
                 maps_get_optional(Uri, scheme),
                 maps_get_optional(Uri, userinfo),
                 maps_get_optional(Uri, host),
-                maps_get_optional(Uri, port),
+                Port,
                 maps_get_or(Uri, path, <<>>),
                 maps_get_optional(Uri, query),
                 maps_get_optional(Uri, fragment)
@@ -482,13 +488,13 @@ index([_, _, _, _, _, _, _, X | _], 7) ->
 index(Tuple, Index) when is_tuple(Tuple) andalso is_integer(Index) ->
     {ok, try
         {some, element(Index + 1, Tuple)}
-    catch _:_ -> 
+    catch _:_ ->
         none
     end};
 index(Map, Key) when is_map(Map) ->
     {ok, try
         {some, maps:get(Key, Map)}
-    catch _:_ -> 
+    catch _:_ ->
         none
     end};
 index(_, Index) when is_integer(Index) ->

test/gleam/uri_test.gleam

@@ -418,6 +418,62 @@ pub fn empty_query_to_string_test() {
   assert query_string == ""
 }
 
+pub fn empty_port_test() {
+  let assert Ok(uri) = uri.parse("//:")
+  assert uri
+    == uri.Uri(
+      scheme: None,
+      userinfo: None,
+      host: Some(""),
+      port: None,
+      path: "",
+      query: None,
+      fragment: None,
+    )
+}
+
+pub fn empty_port_followed_by_query_test() {
+  let assert Ok(uri) = uri.parse("//:?")
+  assert uri
+    == uri.Uri(
+      scheme: None,
+      userinfo: None,
+      host: Some(""),
+      port: None,
+      path: "",
+      query: Some(""),
+      fragment: None,
+    )
+}
+
+pub fn empty_port_followed_by_fragment_test() {
+  let assert Ok(uri) = uri.parse("//:#")
+  assert uri
+    == uri.Uri(
+      scheme: None,
+      userinfo: None,
+      host: Some(""),
+      port: None,
+      path: "",
+      query: None,
+      fragment: Some(""),
+    )
+}
+
+pub fn empty_port_followed_by_path_test() {
+  let assert Ok(uri) = uri.parse("//:/")
+  assert uri
+    == uri.Uri(
+      scheme: None,
+      userinfo: None,
+      host: Some(""),
+      port: None,
+      path: "/",
+      query: None,
+      fragment: None,
+    )
+}
+
 const percent_codec_fixtures = [
   #(" ", "%20"),
   #(",", "%2C"),