Compare commits
	
		
			8 Commits
		
	
	
		
			v2.0.2
			...
			e51116c2b2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e51116c2b2 | |||
| 56e3682237 | |||
| 7f631dc13c | |||
| 91807aac61 | |||
| 7b7e689892 | |||
| 22d13bdf7d | |||
| 3fc9a61afe | |||
| b9d1077425 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -2,3 +2,4 @@
 | 
			
		||||
*.ez
 | 
			
		||||
/build
 | 
			
		||||
erl_crash.dump
 | 
			
		||||
node_modules
 | 
			
		||||
 
 | 
			
		||||
@@ -17,3 +17,12 @@
 | 
			
		||||
 | 
			
		||||
- Minor performance improvement for uris with userinfo
 | 
			
		||||
- More performance improvements for ascii/digit parsing
 | 
			
		||||
 | 
			
		||||
## 2.0.3
 | 
			
		||||
 | 
			
		||||
- Minor performance improvement for erlang
 | 
			
		||||
- Major performance improvement for js
 | 
			
		||||
 | 
			
		||||
## 2.0.4
 | 
			
		||||
 | 
			
		||||
- Reverted some optimisations as they are unnecessary for Gleam v1.14.0+
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,12 @@
 | 
			
		||||
name = "gluri"
 | 
			
		||||
version = "2.0.2"
 | 
			
		||||
version = "2.0.4"
 | 
			
		||||
 | 
			
		||||
# Fill out these fields if you intend to generate HTML documentation or publish
 | 
			
		||||
# your project to the Hex package manager.
 | 
			
		||||
#
 | 
			
		||||
 description = "Uri (RFC 3986) library for Gleam"
 | 
			
		||||
 licences = ["Apache-2.0"]
 | 
			
		||||
 repository = { type = "github", user = "pendletong", repo = "uri" }
 | 
			
		||||
 repository = { type = "gitea", host = "git.pendleton.ie", user = "pendletong", repo = "uri" }
 | 
			
		||||
 links = [{ title = "RFC 3986", href = "https://www.ietf.org/rfc/rfc3986.txt" }]
 | 
			
		||||
#
 | 
			
		||||
# For a full reference of all the available options, you can have a look at
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
 | 
			
		||||
packages = [
 | 
			
		||||
  { name = "argv", version = "1.0.2", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "BA1FF0929525DEBA1CE67256E5ADF77A7CDDFE729E3E3F57A5BDCAA031DED09D" },
 | 
			
		||||
  { name = "benchee", version = "1.4.0", build_tools = ["mix"], requirements = ["deep_merge", "statistex", "table"], otp_app = "benchee", source = "hex", outer_checksum = "299CD10DD8CE51C9EA3DDB74BB150F93D25E968F93E4C1FA31698A8E4FA5D715" },
 | 
			
		||||
  { name = "benchee", version = "1.5.0", build_tools = ["mix"], requirements = ["deep_merge", "statistex", "table"], otp_app = "benchee", source = "hex", outer_checksum = "5B075393AEA81B8AE74EADD1C28B1D87E8A63696C649D8293DB7C4DF3EB67535" },
 | 
			
		||||
  { name = "bigben", version = "1.0.1", build_tools = ["gleam"], requirements = ["birl", "gleam_erlang", "gleam_otp", "gleam_stdlib"], otp_app = "bigben", source = "hex", outer_checksum = "190E489610A80D76C48BACC75EB8314BD184FF0220AB0F251ABE760B993B91BB" },
 | 
			
		||||
  { name = "birl", version = "1.8.0", build_tools = ["gleam"], requirements = ["gleam_regexp", "gleam_stdlib", "ranger"], otp_app = "birl", source = "hex", outer_checksum = "2AC7BA26F998E3DFADDB657148BD5DDFE966958AD4D6D6957DD0D22E5B56C400" },
 | 
			
		||||
  { name = "deep_merge", version = "1.0.0", build_tools = ["mix"], requirements = [], otp_app = "deep_merge", source = "hex", outer_checksum = "CE708E5F094B9CD4E8F2BE4F00D2F4250C4095BE93F8CD6D018C753894885430" },
 | 
			
		||||
@@ -14,9 +14,9 @@ packages = [
 | 
			
		||||
  { name = "gleam_erlang", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_erlang", source = "hex", outer_checksum = "1124AD3AA21143E5AF0FC5CF3D9529F6DB8CA03E43A55711B60B6B7B3874375C" },
 | 
			
		||||
  { name = "gleam_javascript", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_javascript", source = "hex", outer_checksum = "EF6C77A506F026C6FB37941889477CD5E4234FCD4337FF0E9384E297CB8F97EB" },
 | 
			
		||||
  { name = "gleam_json", version = "3.0.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "874FA3C3BB6E22DD2BB111966BD40B3759E9094E05257899A7C08F5DE77EC049" },
 | 
			
		||||
  { name = "gleam_otp", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "7987CBEBC8060B88F14575DEF546253F3116EBE2A5DA6FD82F38243FCE97C54B" },
 | 
			
		||||
  { name = "gleam_otp", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "BA6A294E295E428EC1562DC1C11EA7530DCB981E8359134BEABC8493B7B2258E" },
 | 
			
		||||
  { name = "gleam_regexp", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "9C215C6CA84A5B35BB934A9B61A9A306EC743153BE2B0425A0D032E477B062A9" },
 | 
			
		||||
  { name = "gleam_stdlib", version = "0.63.2", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "962B25C667DA07F4CAB32001F44D3C41C1A89E58E3BBA54F183B482CF6122150" },
 | 
			
		||||
  { name = "gleam_stdlib", version = "0.65.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "7C69C71D8C493AE11A5184828A77110EB05A7786EBF8B25B36A72F879C3EE107" },
 | 
			
		||||
  { name = "gleam_time", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_time", source = "hex", outer_checksum = "DCDDC040CE97DA3D2A925CDBBA08D8A78681139745754A83998641C8A3F6587E" },
 | 
			
		||||
  { name = "gleam_yielder", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_yielder", source = "hex", outer_checksum = "8E4E4ECFA7982859F430C57F549200C7749823C106759F4A19A78AEA6687717A" },
 | 
			
		||||
  { name = "gleeunit", version = "1.6.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "FDC68A8C492B1E9B429249062CD9BAC9B5538C6FBF584817205D0998C42E1DAC" },
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										18
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								package-lock.json
									
									
									
										generated
									
									
									
										Normal file
									
								
							@@ -0,0 +1,18 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "uri",
 | 
			
		||||
  "lockfileVersion": 3,
 | 
			
		||||
  "requires": true,
 | 
			
		||||
  "packages": {
 | 
			
		||||
    "": {
 | 
			
		||||
      "dependencies": {
 | 
			
		||||
        "mitata": "^1.0.34"
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/mitata": {
 | 
			
		||||
      "version": "1.0.34",
 | 
			
		||||
      "resolved": "https://registry.npmjs.org/mitata/-/mitata-1.0.34.tgz",
 | 
			
		||||
      "integrity": "sha512-Mc3zrtNBKIMeHSCQ0XqRLo1vbdIx1wvFV9c8NJAiyho6AjNfMY8bVhbS12bwciUdd1t4rj8099CH3N3NFahaUA==",
 | 
			
		||||
      "license": "MIT"
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										6
									
								
								package.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								package.json
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "type": "module",
 | 
			
		||||
  "dependencies": {
 | 
			
		||||
    "mitata": "^1.0.34"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
@@ -730,51 +730,55 @@ fn parse_unreserved(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
//                 %21 / %24 / %26 / %27 / %28 / %29
 | 
			
		||||
//               / %2A / %2B / %2C / %3B / %3D
 | 
			
		||||
fn parse_sub_delim(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
  case string.pop_grapheme(str) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x26 && i <= 0x2C -> Ok(#(char, tail))
 | 
			
		||||
        _ if i == 0x21 -> Ok(#(char, tail))
 | 
			
		||||
        _ if i == 0x24 -> Ok(#(char, tail))
 | 
			
		||||
        _ if i == 0x3B -> Ok(#(char, tail))
 | 
			
		||||
        _ if i == 0x3D -> Ok(#(char, tail))
 | 
			
		||||
  case str {
 | 
			
		||||
    "!" as char <> tail
 | 
			
		||||
    | "$" as char <> tail
 | 
			
		||||
    | "&" as char <> tail
 | 
			
		||||
    | "'" as char <> tail
 | 
			
		||||
    | "(" as char <> tail
 | 
			
		||||
    | ")" as char <> tail
 | 
			
		||||
    | "*" as char <> tail
 | 
			
		||||
    | "+" as char <> tail
 | 
			
		||||
    | "," as char <> tail
 | 
			
		||||
    | ";" as char <> tail
 | 
			
		||||
    | "=" as char <> tail -> Ok(#(char, tail))
 | 
			
		||||
    _ -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// DIGIT    = %x30–39
 | 
			
		||||
fn parse_digit(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
  case string.pop_grapheme(str) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x30 && i <= 0x39 -> Ok(#(char, tail))
 | 
			
		||||
  case str {
 | 
			
		||||
    "0" as char <> tail
 | 
			
		||||
    | "1" as char <> tail
 | 
			
		||||
    | "2" as char <> tail
 | 
			
		||||
    | "3" as char <> tail
 | 
			
		||||
    | "4" as char <> tail
 | 
			
		||||
    | "5" as char <> tail
 | 
			
		||||
    | "6" as char <> tail
 | 
			
		||||
    | "7" as char <> tail
 | 
			
		||||
    | "8" as char <> tail
 | 
			
		||||
    | "9" as char <> tail -> Ok(#(char, tail))
 | 
			
		||||
 | 
			
		||||
    _ -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// DIGIT (non-zero)    = %x31–39
 | 
			
		||||
fn parse_digit_nz(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
  case string.pop_grapheme(str) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x31 && i <= 0x39 -> Ok(#(char, tail))
 | 
			
		||||
  case str {
 | 
			
		||||
    "1" as char <> tail
 | 
			
		||||
    | "2" as char <> tail
 | 
			
		||||
    | "3" as char <> tail
 | 
			
		||||
    | "4" as char <> tail
 | 
			
		||||
    | "5" as char <> tail
 | 
			
		||||
    | "6" as char <> tail
 | 
			
		||||
    | "7" as char <> tail
 | 
			
		||||
    | "8" as char <> tail
 | 
			
		||||
    | "9" as char <> tail -> Ok(#(char, tail))
 | 
			
		||||
 | 
			
		||||
    _ -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn parse_digits(str: String, digits: String) {
 | 
			
		||||
@@ -788,18 +792,62 @@ fn parse_digits(str: String, digits: String) {
 | 
			
		||||
 | 
			
		||||
// ALPHA    = %x41–5A | %x61–7A
 | 
			
		||||
fn parse_alpha(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
  case string.pop_grapheme(str) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x41 && i <= 0x5A -> Ok(#(char, tail))
 | 
			
		||||
        _ if i >= 0x61 && i <= 0x7A -> Ok(#(char, tail))
 | 
			
		||||
  case str {
 | 
			
		||||
    "a" as char <> tail
 | 
			
		||||
    | "b" as char <> tail
 | 
			
		||||
    | "c" as char <> tail
 | 
			
		||||
    | "d" as char <> tail
 | 
			
		||||
    | "e" as char <> tail
 | 
			
		||||
    | "f" as char <> tail
 | 
			
		||||
    | "g" as char <> tail
 | 
			
		||||
    | "h" as char <> tail
 | 
			
		||||
    | "i" as char <> tail
 | 
			
		||||
    | "j" as char <> tail
 | 
			
		||||
    | "k" as char <> tail
 | 
			
		||||
    | "l" as char <> tail
 | 
			
		||||
    | "m" as char <> tail
 | 
			
		||||
    | "n" as char <> tail
 | 
			
		||||
    | "o" as char <> tail
 | 
			
		||||
    | "p" as char <> tail
 | 
			
		||||
    | "q" as char <> tail
 | 
			
		||||
    | "r" as char <> tail
 | 
			
		||||
    | "s" as char <> tail
 | 
			
		||||
    | "t" as char <> tail
 | 
			
		||||
    | "u" as char <> tail
 | 
			
		||||
    | "v" as char <> tail
 | 
			
		||||
    | "w" as char <> tail
 | 
			
		||||
    | "x" as char <> tail
 | 
			
		||||
    | "y" as char <> tail
 | 
			
		||||
    | "z" as char <> tail
 | 
			
		||||
    | "A" as char <> tail
 | 
			
		||||
    | "B" as char <> tail
 | 
			
		||||
    | "C" as char <> tail
 | 
			
		||||
    | "D" as char <> tail
 | 
			
		||||
    | "E" as char <> tail
 | 
			
		||||
    | "F" as char <> tail
 | 
			
		||||
    | "G" as char <> tail
 | 
			
		||||
    | "H" as char <> tail
 | 
			
		||||
    | "I" as char <> tail
 | 
			
		||||
    | "J" as char <> tail
 | 
			
		||||
    | "K" as char <> tail
 | 
			
		||||
    | "L" as char <> tail
 | 
			
		||||
    | "M" as char <> tail
 | 
			
		||||
    | "N" as char <> tail
 | 
			
		||||
    | "O" as char <> tail
 | 
			
		||||
    | "P" as char <> tail
 | 
			
		||||
    | "Q" as char <> tail
 | 
			
		||||
    | "R" as char <> tail
 | 
			
		||||
    | "S" as char <> tail
 | 
			
		||||
    | "T" as char <> tail
 | 
			
		||||
    | "U" as char <> tail
 | 
			
		||||
    | "V" as char <> tail
 | 
			
		||||
    | "W" as char <> tail
 | 
			
		||||
    | "X" as char <> tail
 | 
			
		||||
    | "Y" as char <> tail
 | 
			
		||||
    | "Z" as char <> tail -> Ok(#(char, tail))
 | 
			
		||||
 | 
			
		||||
    _ -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn parse_query_parts(query: String) -> Result(List(#(String, String)), Nil) {
 | 
			
		||||
 
 | 
			
		||||
@@ -109,7 +109,7 @@ pub fn parse_min_max(
 | 
			
		||||
  do_parse_min_max(str, "", min, max, parse_fn)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn do_parse_min_max(
 | 
			
		||||
fn do_parse_min_max(
 | 
			
		||||
  str: d,
 | 
			
		||||
  acc: String,
 | 
			
		||||
  min: Int,
 | 
			
		||||
@@ -371,33 +371,38 @@ fn unescape_percent(str: String) -> String {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn parse_hex_digit(str: String) -> Result(#(String, String), Nil) {
 | 
			
		||||
  case string.pop_grapheme(str) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x30 && i <= 0x39 -> Ok(#(char, tail))
 | 
			
		||||
        _ if i >= 0x41 && i <= 0x46 -> Ok(#(char, tail))
 | 
			
		||||
        _ if i >= 0x61 && i <= 0x66 -> Ok(#(char, tail))
 | 
			
		||||
  case str {
 | 
			
		||||
    "0" as char <> tail
 | 
			
		||||
    | "1" as char <> tail
 | 
			
		||||
    | "2" as char <> tail
 | 
			
		||||
    | "3" as char <> tail
 | 
			
		||||
    | "4" as char <> tail
 | 
			
		||||
    | "5" as char <> tail
 | 
			
		||||
    | "6" as char <> tail
 | 
			
		||||
    | "7" as char <> tail
 | 
			
		||||
    | "8" as char <> tail
 | 
			
		||||
    | "9" as char <> tail
 | 
			
		||||
    | "a" as char <> tail
 | 
			
		||||
    | "b" as char <> tail
 | 
			
		||||
    | "c" as char <> tail
 | 
			
		||||
    | "d" as char <> tail
 | 
			
		||||
    | "e" as char <> tail
 | 
			
		||||
    | "f" as char <> tail
 | 
			
		||||
    | "A" as char <> tail
 | 
			
		||||
    | "B" as char <> tail
 | 
			
		||||
    | "C" as char <> tail
 | 
			
		||||
    | "D" as char <> tail
 | 
			
		||||
    | "E" as char <> tail
 | 
			
		||||
    | "F" as char <> tail -> Ok(#(char, tail))
 | 
			
		||||
 | 
			
		||||
    _ -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Error(Nil)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn parse_hex_digits(str, min, max) {
 | 
			
		||||
  parse_min_max(str, min, max, parse_hex_digit)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn encoding_not_needed(i: Int) -> Bool {
 | 
			
		||||
  // $-_.+!*'()
 | 
			
		||||
  case i {
 | 
			
		||||
    36 | 45 | 95 | 46 | 43 | 33 | 42 | 39 | 40 | 41 -> True
 | 
			
		||||
    _ -> False
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fn is_unreserved_char(i: Int) -> Bool {
 | 
			
		||||
  case i {
 | 
			
		||||
    45 | 46 | 95 | 126 -> True
 | 
			
		||||
@@ -647,13 +652,13 @@ pub fn do_percent_encode(str: String) -> String {
 | 
			
		||||
fn encode_codepoint(codepoint: Int) -> String {
 | 
			
		||||
  case codepoint <= 127 {
 | 
			
		||||
    True -> {
 | 
			
		||||
      case is_unreserved_char(codepoint) || encoding_not_needed(codepoint) {
 | 
			
		||||
      case is_unreserved_char(codepoint) {
 | 
			
		||||
        True -> {
 | 
			
		||||
          let assert Ok(cpnt) = string.utf_codepoint(codepoint)
 | 
			
		||||
          string.from_utf_codepoints([cpnt])
 | 
			
		||||
        }
 | 
			
		||||
        False -> {
 | 
			
		||||
          "%" <> int.to_base16(codepoint)
 | 
			
		||||
          "%" <> string.pad_start(int.to_base16(codepoint), 2, "0")
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,3 +1,4 @@
 | 
			
		||||
import gleam/string
 | 
			
		||||
import gleam/uri as uri2
 | 
			
		||||
import gluri as uri
 | 
			
		||||
import glychee/benchmark
 | 
			
		||||
@@ -9,6 +10,7 @@ pub fn main() {
 | 
			
		||||
  configuration.set_pair(configuration.Warmup, 2)
 | 
			
		||||
  configuration.set_pair(configuration.Parallel, 2)
 | 
			
		||||
 | 
			
		||||
  // pop_benchmark()
 | 
			
		||||
  parse_benchmark()
 | 
			
		||||
  // reg_name_benchmark()
 | 
			
		||||
  // ip_benchmark()
 | 
			
		||||
@@ -82,3 +84,280 @@ pub fn parse_benchmark() {
 | 
			
		||||
    ],
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@target(erlang)
 | 
			
		||||
pub fn pop_benchmark() {
 | 
			
		||||
  benchmark.run(
 | 
			
		||||
    [
 | 
			
		||||
      benchmark.Function("pop with range", fn(data) { fn() { pop(data, "") } }),
 | 
			
		||||
      benchmark.Function("pop check char", fn(data) { fn() { pop4(data, "") } }),
 | 
			
		||||
      benchmark.Function("pop check result", fn(data) {
 | 
			
		||||
        fn() { pop5(data, "") }
 | 
			
		||||
      }),
 | 
			
		||||
      benchmark.Function("letter as var <> tail", fn(data) {
 | 
			
		||||
        fn() { pop2(data, "") }
 | 
			
		||||
      }),
 | 
			
		||||
      benchmark.Function("letter <> tail", fn(data) { fn() { pop3(data, "") } }),
 | 
			
		||||
    ],
 | 
			
		||||
    [
 | 
			
		||||
      // benchmark.Data("long", "abcdefghijklmnopqrstuvwxyz"),
 | 
			
		||||
      benchmark.Data(
 | 
			
		||||
        "with user",
 | 
			
		||||
        "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
 | 
			
		||||
      ),
 | 
			
		||||
      // benchmark.Data("ipv4", "https://192.255.36.4/"),
 | 
			
		||||
    ],
 | 
			
		||||
  )
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn pop(input, _) {
 | 
			
		||||
  case string.pop_grapheme(input) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
			
		||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
			
		||||
      case i {
 | 
			
		||||
        _ if i >= 0x41 && i <= 0x5A -> pop(tail, char)
 | 
			
		||||
        _ if i >= 0x61 && i <= 0x7A -> pop(tail, char)
 | 
			
		||||
        _ -> Nil
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Nil
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn pop2(input, _) {
 | 
			
		||||
  case input {
 | 
			
		||||
    "a" as j <> tail
 | 
			
		||||
    | "b" as j <> tail
 | 
			
		||||
    | "c" as j <> tail
 | 
			
		||||
    | "d" as j <> tail
 | 
			
		||||
    | "e" as j <> tail
 | 
			
		||||
    | "f" as j <> tail
 | 
			
		||||
    | "g" as j <> tail
 | 
			
		||||
    | "h" as j <> tail
 | 
			
		||||
    | "i" as j <> tail
 | 
			
		||||
    | "j" as j <> tail
 | 
			
		||||
    | "k" as j <> tail
 | 
			
		||||
    | "l" as j <> tail
 | 
			
		||||
    | "m" as j <> tail
 | 
			
		||||
    | "n" as j <> tail
 | 
			
		||||
    | "o" as j <> tail
 | 
			
		||||
    | "p" as j <> tail
 | 
			
		||||
    | "q" as j <> tail
 | 
			
		||||
    | "r" as j <> tail
 | 
			
		||||
    | "s" as j <> tail
 | 
			
		||||
    | "t" as j <> tail
 | 
			
		||||
    | "u" as j <> tail
 | 
			
		||||
    | "v" as j <> tail
 | 
			
		||||
    | "w" as j <> tail
 | 
			
		||||
    | "x" as j <> tail
 | 
			
		||||
    | "y" as j <> tail
 | 
			
		||||
    | "z" as j <> tail
 | 
			
		||||
    | "A" as j <> tail
 | 
			
		||||
    | "B" as j <> tail
 | 
			
		||||
    | "C" as j <> tail
 | 
			
		||||
    | "D" as j <> tail
 | 
			
		||||
    | "E" as j <> tail
 | 
			
		||||
    | "F" as j <> tail
 | 
			
		||||
    | "G" as j <> tail
 | 
			
		||||
    | "H" as j <> tail
 | 
			
		||||
    | "I" as j <> tail
 | 
			
		||||
    | "J" as j <> tail
 | 
			
		||||
    | "K" as j <> tail
 | 
			
		||||
    | "L" as j <> tail
 | 
			
		||||
    | "M" as j <> tail
 | 
			
		||||
    | "N" as j <> tail
 | 
			
		||||
    | "O" as j <> tail
 | 
			
		||||
    | "P" as j <> tail
 | 
			
		||||
    | "Q" as j <> tail
 | 
			
		||||
    | "R" as j <> tail
 | 
			
		||||
    | "S" as j <> tail
 | 
			
		||||
    | "T" as j <> tail
 | 
			
		||||
    | "U" as j <> tail
 | 
			
		||||
    | "V" as j <> tail
 | 
			
		||||
    | "W" as j <> tail
 | 
			
		||||
    | "X" as j <> tail
 | 
			
		||||
    | "Y" as j <> tail
 | 
			
		||||
    | "Z" as j <> tail -> pop2(tail, j)
 | 
			
		||||
    _ -> Nil
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn pop3(input, _) {
 | 
			
		||||
  case input {
 | 
			
		||||
    "a" <> tail
 | 
			
		||||
    | "b" <> tail
 | 
			
		||||
    | "c" <> tail
 | 
			
		||||
    | "d" <> tail
 | 
			
		||||
    | "e" <> tail
 | 
			
		||||
    | "f" <> tail
 | 
			
		||||
    | "g" <> tail
 | 
			
		||||
    | "h" <> tail
 | 
			
		||||
    | "i" <> tail
 | 
			
		||||
    | "j" <> tail
 | 
			
		||||
    | "k" <> tail
 | 
			
		||||
    | "l" <> tail
 | 
			
		||||
    | "m" <> tail
 | 
			
		||||
    | "n" <> tail
 | 
			
		||||
    | "o" <> tail
 | 
			
		||||
    | "p" <> tail
 | 
			
		||||
    | "q" <> tail
 | 
			
		||||
    | "r" <> tail
 | 
			
		||||
    | "s" <> tail
 | 
			
		||||
    | "t" <> tail
 | 
			
		||||
    | "u" <> tail
 | 
			
		||||
    | "v" <> tail
 | 
			
		||||
    | "w" <> tail
 | 
			
		||||
    | "x" <> tail
 | 
			
		||||
    | "y" <> tail
 | 
			
		||||
    | "z" <> tail
 | 
			
		||||
    | "A" <> tail
 | 
			
		||||
    | "B" <> tail
 | 
			
		||||
    | "C" <> tail
 | 
			
		||||
    | "D" <> tail
 | 
			
		||||
    | "E" <> tail
 | 
			
		||||
    | "F" <> tail
 | 
			
		||||
    | "G" <> tail
 | 
			
		||||
    | "H" <> tail
 | 
			
		||||
    | "I" <> tail
 | 
			
		||||
    | "J" <> tail
 | 
			
		||||
    | "K" <> tail
 | 
			
		||||
    | "L" <> tail
 | 
			
		||||
    | "M" <> tail
 | 
			
		||||
    | "N" <> tail
 | 
			
		||||
    | "O" <> tail
 | 
			
		||||
    | "P" <> tail
 | 
			
		||||
    | "Q" <> tail
 | 
			
		||||
    | "R" <> tail
 | 
			
		||||
    | "S" <> tail
 | 
			
		||||
    | "T" <> tail
 | 
			
		||||
    | "U" <> tail
 | 
			
		||||
    | "V" <> tail
 | 
			
		||||
    | "W" <> tail
 | 
			
		||||
    | "X" <> tail
 | 
			
		||||
    | "Y" <> tail
 | 
			
		||||
    | "Z" <> tail -> pop3(tail, "")
 | 
			
		||||
    _ -> Nil
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn pop4(input, _) {
 | 
			
		||||
  case string.pop_grapheme(input) {
 | 
			
		||||
    Ok(#(char, tail)) -> {
 | 
			
		||||
      case char {
 | 
			
		||||
        "a"
 | 
			
		||||
        | "b"
 | 
			
		||||
        | "c"
 | 
			
		||||
        | "d"
 | 
			
		||||
        | "e"
 | 
			
		||||
        | "f"
 | 
			
		||||
        | "g"
 | 
			
		||||
        | "h"
 | 
			
		||||
        | "i"
 | 
			
		||||
        | "j"
 | 
			
		||||
        | "k"
 | 
			
		||||
        | "l"
 | 
			
		||||
        | "m"
 | 
			
		||||
        | "n"
 | 
			
		||||
        | "o"
 | 
			
		||||
        | "p"
 | 
			
		||||
        | "q"
 | 
			
		||||
        | "r"
 | 
			
		||||
        | "s"
 | 
			
		||||
        | "t"
 | 
			
		||||
        | "u"
 | 
			
		||||
        | "v"
 | 
			
		||||
        | "w"
 | 
			
		||||
        | "x"
 | 
			
		||||
        | "y"
 | 
			
		||||
        | "z"
 | 
			
		||||
        | "A"
 | 
			
		||||
        | "B"
 | 
			
		||||
        | "C"
 | 
			
		||||
        | "D"
 | 
			
		||||
        | "E"
 | 
			
		||||
        | "F"
 | 
			
		||||
        | "G"
 | 
			
		||||
        | "H"
 | 
			
		||||
        | "I"
 | 
			
		||||
        | "J"
 | 
			
		||||
        | "K"
 | 
			
		||||
        | "L"
 | 
			
		||||
        | "M"
 | 
			
		||||
        | "N"
 | 
			
		||||
        | "O"
 | 
			
		||||
        | "P"
 | 
			
		||||
        | "Q"
 | 
			
		||||
        | "R"
 | 
			
		||||
        | "S"
 | 
			
		||||
        | "T"
 | 
			
		||||
        | "U"
 | 
			
		||||
        | "V"
 | 
			
		||||
        | "W"
 | 
			
		||||
        | "X"
 | 
			
		||||
        | "Y"
 | 
			
		||||
        | "Z" -> pop4(tail, char)
 | 
			
		||||
        _ -> Nil
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
    Error(_) -> Nil
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn pop5(input, _) {
 | 
			
		||||
  case string.pop_grapheme(input) {
 | 
			
		||||
    Ok(#("a" as char, tail))
 | 
			
		||||
    | Ok(#("b" as char, tail))
 | 
			
		||||
    | Ok(#("c" as char, tail))
 | 
			
		||||
    | Ok(#("d" as char, tail))
 | 
			
		||||
    | Ok(#("e" as char, tail))
 | 
			
		||||
    | Ok(#("f" as char, tail))
 | 
			
		||||
    | Ok(#("g" as char, tail))
 | 
			
		||||
    | Ok(#("h" as char, tail))
 | 
			
		||||
    | Ok(#("i" as char, tail))
 | 
			
		||||
    | Ok(#("j" as char, tail))
 | 
			
		||||
    | Ok(#("k" as char, tail))
 | 
			
		||||
    | Ok(#("l" as char, tail))
 | 
			
		||||
    | Ok(#("m" as char, tail))
 | 
			
		||||
    | Ok(#("n" as char, tail))
 | 
			
		||||
    | Ok(#("o" as char, tail))
 | 
			
		||||
    | Ok(#("p" as char, tail))
 | 
			
		||||
    | Ok(#("q" as char, tail))
 | 
			
		||||
    | Ok(#("r" as char, tail))
 | 
			
		||||
    | Ok(#("s" as char, tail))
 | 
			
		||||
    | Ok(#("t" as char, tail))
 | 
			
		||||
    | Ok(#("u" as char, tail))
 | 
			
		||||
    | Ok(#("v" as char, tail))
 | 
			
		||||
    | Ok(#("w" as char, tail))
 | 
			
		||||
    | Ok(#("x" as char, tail))
 | 
			
		||||
    | Ok(#("y" as char, tail))
 | 
			
		||||
    | Ok(#("z" as char, tail))
 | 
			
		||||
    | Ok(#("A" as char, tail))
 | 
			
		||||
    | Ok(#("B" as char, tail))
 | 
			
		||||
    | Ok(#("C" as char, tail))
 | 
			
		||||
    | Ok(#("D" as char, tail))
 | 
			
		||||
    | Ok(#("E" as char, tail))
 | 
			
		||||
    | Ok(#("F" as char, tail))
 | 
			
		||||
    | Ok(#("G" as char, tail))
 | 
			
		||||
    | Ok(#("H" as char, tail))
 | 
			
		||||
    | Ok(#("I" as char, tail))
 | 
			
		||||
    | Ok(#("J" as char, tail))
 | 
			
		||||
    | Ok(#("K" as char, tail))
 | 
			
		||||
    | Ok(#("L" as char, tail))
 | 
			
		||||
    | Ok(#("M" as char, tail))
 | 
			
		||||
    | Ok(#("N" as char, tail))
 | 
			
		||||
    | Ok(#("O" as char, tail))
 | 
			
		||||
    | Ok(#("P" as char, tail))
 | 
			
		||||
    | Ok(#("Q" as char, tail))
 | 
			
		||||
    | Ok(#("R" as char, tail))
 | 
			
		||||
    | Ok(#("S" as char, tail))
 | 
			
		||||
    | Ok(#("T" as char, tail))
 | 
			
		||||
    | Ok(#("U" as char, tail))
 | 
			
		||||
    | Ok(#("V" as char, tail))
 | 
			
		||||
    | Ok(#("W" as char, tail))
 | 
			
		||||
    | Ok(#("X" as char, tail))
 | 
			
		||||
    | Ok(#("Y" as char, tail))
 | 
			
		||||
    | Ok(#("Z" as char, tail)) -> pop4(tail, char)
 | 
			
		||||
    _ -> Nil
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										16
									
								
								test/benchmark.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								test/benchmark.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,16 @@
 | 
			
		||||
import { run, bench, boxplot, summary } from "mitata";
 | 
			
		||||
import { parse } from "../build/dev/javascript/gluri/gluri.mjs";
 | 
			
		||||
import { parse as parse2 } from "../build/dev/javascript/gleam_stdlib/gleam/uri.mjs";
 | 
			
		||||
 | 
			
		||||
bench("parse", () =>
 | 
			
		||||
  parse(
 | 
			
		||||
    "https://test_name:user%20$$$@github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
 | 
			
		||||
  ),
 | 
			
		||||
);
 | 
			
		||||
bench("parse2", () =>
 | 
			
		||||
  parse2(
 | 
			
		||||
    "https://test_name:user%20$$$@github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
 | 
			
		||||
  ),
 | 
			
		||||
);
 | 
			
		||||
 | 
			
		||||
await run();
 | 
			
		||||
@@ -1146,37 +1146,31 @@ pub fn equivalence_tests() {
 | 
			
		||||
  ])
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
const percent_codec_fixtures = [
 | 
			
		||||
  #(" ", "%20"),
 | 
			
		||||
  #(",", "%2C"),
 | 
			
		||||
  #(";", "%3B"),
 | 
			
		||||
  #(":", "%3A"),
 | 
			
		||||
  #("!", "!"),
 | 
			
		||||
  #("?", "%3F"),
 | 
			
		||||
  #("'", "'"),
 | 
			
		||||
  #("(", "("),
 | 
			
		||||
  #(")", ")"),
 | 
			
		||||
  #("[", "%5B"),
 | 
			
		||||
  #("@", "%40"),
 | 
			
		||||
  #("/", "%2F"),
 | 
			
		||||
  #("\\", "%5C"),
 | 
			
		||||
const percent_encode_examples = [
 | 
			
		||||
  #("", ""),
 | 
			
		||||
  #("%", "%25"),
 | 
			
		||||
  #("%%", "%25%25"),
 | 
			
		||||
  #(" \r\n\t\u{B}\f", "%20%0D%0A%09%0B%0C"),
 | 
			
		||||
  #(
 | 
			
		||||
    "-_.~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
 | 
			
		||||
    "-_.~0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
 | 
			
		||||
  ),
 | 
			
		||||
  #("\u{0}", "%00"),
 | 
			
		||||
  #("abc\u{00}def", "abc%00def"),
 | 
			
		||||
  #("&", "%26"),
 | 
			
		||||
  #("#", "%23"),
 | 
			
		||||
  #("=", "%3D"),
 | 
			
		||||
  #("~", "~"),
 | 
			
		||||
  #("ñ", "%C3%B1"),
 | 
			
		||||
  #("-", "-"),
 | 
			
		||||
  #("_", "_"),
 | 
			
		||||
  #(".", "."),
 | 
			
		||||
  #("*", "*"),
 | 
			
		||||
  #("+", "+"),
 | 
			
		||||
  #("100% great+fun", "100%25%20great+fun"),
 | 
			
		||||
  #(
 | 
			
		||||
    "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
 | 
			
		||||
    "%21%22%23%24%25%26%27%28%29%2A%2B%2C-.%2F%3A%3B%3C%3D%3E%3F%40%5B%5C%5D%5E_%60%7B%7C%7D~",
 | 
			
		||||
  ),
 | 
			
		||||
  #("“Aha”", "%E2%80%9CAha%E2%80%9D"),
 | 
			
		||||
  #("\u{201C}Aha\u{201D}", "%E2%80%9CAha%E2%80%9D"),
 | 
			
		||||
  #("*+,=>/", "%2A%2B%2C%3D%3E%2F"),
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
pub fn percent_encode_tests() {
 | 
			
		||||
  describe("percent encoding", [
 | 
			
		||||
    it("encoding", fn() {
 | 
			
		||||
      percent_codec_fixtures
 | 
			
		||||
      percent_encode_examples
 | 
			
		||||
      |> list.map(fn(t) {
 | 
			
		||||
        let #(a, b) = t
 | 
			
		||||
        uri.percent_encode(a)
 | 
			
		||||
@@ -1185,7 +1179,7 @@ pub fn percent_encode_tests() {
 | 
			
		||||
      Nil
 | 
			
		||||
    }),
 | 
			
		||||
    it("decoding", fn() {
 | 
			
		||||
      percent_codec_fixtures
 | 
			
		||||
      percent_encode_examples
 | 
			
		||||
      |> list.map(fn(t) {
 | 
			
		||||
        let #(a, b) = t
 | 
			
		||||
        uri.percent_decode(b)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user