did some chores

Author: massivefermion

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '26'
-          gleam-version: '1.1'
+          gleam-version: '1.6'
 
       - run: |
           version="v$(cat gleam.toml | grep -m 1 "version" | sed -r "s/version *= *\"([[:digit:].]+)\"/\1/")"

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '26'
-          gleam-version: '1.1'
+          gleam-version: '1.6'
           rebar3-version: '3'
       - run: gleam test
       - run: gleam format --check src test

gleam.toml

@@ -1,5 +1,5 @@
 name = "blah"
-version = "1.3.0"
+version = "1.4.0"
 
 description = "fake data generation for gleam"
 licences = ["Apache-2.0"]
@@ -10,8 +10,9 @@ gleam = ">= 0.32.0"
 internal_modules = ["blah/en/*", "blah/utils", "blah/locales/*"]
 
 [dependencies]
-birl = "~> 1.6"
-gleam_stdlib = "~> 0.37 or ~> 1.0"
+birl = "~> 1.8"
+gleam_stdlib = ">= 0.49.0 or < 2.0.0"
+gleam_regexp = ">= 1.0.0 and < 2.0.0"
 
 [dev-dependencies]
-gleeunit = "~> 1.1"
+gleeunit = "~> 1.2"

manifest.toml

@@ -2,13 +2,16 @@
 # You typically do not need to edit this file
 
 packages = [
-  { name = "birl", version = "1.6.1", build_tools = ["gleam"], requirements = ["gleam_stdlib", "ranger"], otp_app = "birl", source = "hex", outer_checksum = "976CFF85D34D50F7775896615A71745FBE0C325E50399787088F941B539A0497" },
-  { name = "gleam_stdlib", version = "0.37.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "5398BD6C2ABA17338F676F42F404B9B7BABE1C8DC7380031ACB05BBE1BCF3742" },
-  { name = "gleeunit", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "72CDC3D3F719478F26C4E2C5FED3E657AC81EC14A47D2D2DEBB8693CA3220C3B" },
-  { name = "ranger", version = "1.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "ranger", source = "hex", outer_checksum = "1566C272B1D141B3BBA38B25CB761EF56E312E79EC0E2DFD4D3C19FB0CC1F98C" },
+  { name = "birl", version = "1.8.0", build_tools = ["gleam"], requirements = ["gleam_regexp", "gleam_stdlib", "ranger"], otp_app = "birl", source = "hex", outer_checksum = "2AC7BA26F998E3DFADDB657148BD5DDFE966958AD4D6D6957DD0D22E5B56C400" },
+  { name = "gleam_regexp", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "A3655FDD288571E90EE9C4009B719FEF59FA16AFCDF3952A76A125AF23CF1592" },
+  { name = "gleam_stdlib", version = "0.49.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "A7DB09F15738198A87255425FBCE049B4B84C77CC522786DC923DABA73911F13" },
+  { 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.2.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7A7228925D3EE7D0813C922E062BFD6D7E9310F0BEE585D3A42F3307E3CFD13" },
+  { name = "ranger", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "gleam_yielder"], otp_app = "ranger", source = "hex", outer_checksum = "C8988E8F8CDBD3E7F4D8F2E663EF76490390899C2B2885A6432E942495B3E854" },
 ]
 
 [requirements]
-birl = { version = "~> 1.6" }
-gleam_stdlib = { version = "~> 0.37 or ~> 1.0" }
-gleeunit = { version = "~> 1.1" }
+birl = { version = "~> 1.8" }
+gleam_regexp = { version = ">= 1.0.0 and < 2.0.0" }
+gleam_stdlib = { version = ">= 0.49.0 or < 2.0.0" }
+gleeunit = { version = "~> 1.2" }

src/blah/en/string.gleam

@@ -2,28 +2,28 @@
 
 import gleam/list
 import gleam/string
-import gleam/string_builder.{type StringBuilder}
+import gleam/string_tree.{type StringTree}
 
 import blah/utils.{get_random_int, get_random_item}
 
 pub fn alpha(length: Int) {
-  alpha_internal(length, string_builder.new())
+  alpha_internal(length, string_tree.new())
 }
 
 pub fn lower_alpha(length: Int) {
-  lower_internal(length, string_builder.new())
+  lower_internal(length, string_tree.new())
 }
 
 pub fn upper_alpha(length: Int) {
-  upper_internal(length, string_builder.new())
+  upper_internal(length, string_tree.new())
 }
 
 pub fn numeric(length: Int) {
-  numeric_internal(length, string_builder.new())
+  numeric_internal(length, string_tree.new())
 }
 
 pub fn alphanumeric(length: Int) {
-  alphanumeric_internal(length, string_builder.new())
+  alphanumeric_internal(length, string_tree.new())
 }
 
 /// you can use the below codes to specify your desired pattern:
@@ -41,26 +41,26 @@ pub fn alphanumeric(length: Int) {
 ///     %u - uppercase letters
 ///
 pub fn with_pattern(given_pattern: String) {
-  with_pattern_internal(given_pattern, string_builder.new())
+  with_pattern_internal(given_pattern, string_tree.new())
 }
 
 pub fn roman_numeral(min: Int, max: Int) {
   get_random_int(min, max)
   |> list.repeat("I", _)
-  |> string_builder.from_strings
-  |> string_builder.replace("IIIII", "V")
-  |> string_builder.replace("VV", "X")
-  |> string_builder.replace("XXXXX", "L")
-  |> string_builder.replace("LL", "C")
-  |> string_builder.replace("CCCCC", "D")
-  |> string_builder.replace("DD", "M")
-  |> string_builder.replace("DCCCC", "CM")
-  |> string_builder.replace("CCCC", "CD")
-  |> string_builder.replace("LXXXX", "XC")
-  |> string_builder.replace("XXXX", "XL")
-  |> string_builder.replace("VIIII", "IX")
-  |> string_builder.replace("IIII", "IV")
-  |> string_builder.to_string
+  |> string_tree.from_strings
+  |> string_tree.replace("IIIII", "V")
+  |> string_tree.replace("VV", "X")
+  |> string_tree.replace("XXXXX", "L")
+  |> string_tree.replace("LL", "C")
+  |> string_tree.replace("CCCCC", "D")
+  |> string_tree.replace("DD", "M")
+  |> string_tree.replace("DCCCC", "CM")
+  |> string_tree.replace("CCCC", "CD")
+  |> string_tree.replace("LXXXX", "XC")
+  |> string_tree.replace("XXXX", "XL")
+  |> string_tree.replace("VIIII", "IX")
+  |> string_tree.replace("IIII", "IV")
+  |> string_tree.to_string
 }
 
 const lower_letters = [
@@ -91,68 +91,65 @@ const characters = [
   "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
 ]
 
-fn alpha_internal(remaining: Int, storage: StringBuilder) -> String {
+fn alpha_internal(remaining: Int, storage: StringTree) -> String {
   case remaining == 0 {
-    True -> string_builder.to_string(storage)
+    True -> string_tree.to_string(storage)
 
     False -> {
       let letter = get_random_item(letters)
-      alpha_internal(remaining - 1, string_builder.append(storage, letter))
+      alpha_internal(remaining - 1, string_tree.append(storage, letter))
     }
   }
 }
 
-fn lower_internal(remaining: Int, storage: StringBuilder) -> String {
+fn lower_internal(remaining: Int, storage: StringTree) -> String {
   case remaining == 0 {
-    True -> string_builder.to_string(storage)
+    True -> string_tree.to_string(storage)
 
     False -> {
       let letter = get_random_item(lower_letters)
-      lower_internal(remaining - 1, string_builder.append(storage, letter))
+      lower_internal(remaining - 1, string_tree.append(storage, letter))
     }
   }
 }
 
-fn upper_internal(remaining: Int, storage: StringBuilder) -> String {
+fn upper_internal(remaining: Int, storage: StringTree) -> String {
   case remaining == 0 {
-    True -> string_builder.to_string(storage)
+    True -> string_tree.to_string(storage)
 
     False -> {
       let letter = get_random_item(upper_letters)
-      upper_internal(remaining - 1, string_builder.append(storage, letter))
+      upper_internal(remaining - 1, string_tree.append(storage, letter))
     }
   }
 }
 
-fn numeric_internal(remaining: Int, storage: StringBuilder) -> String {
+fn numeric_internal(remaining: Int, storage: StringTree) -> String {
   case remaining == 0 {
-    True -> string_builder.to_string(storage)
+    True -> string_tree.to_string(storage)
 
     False -> {
       let digit = get_random_item(digits)
-      numeric_internal(remaining - 1, string_builder.append(storage, digit))
+      numeric_internal(remaining - 1, string_tree.append(storage, digit))
     }
   }
 }
 
-fn alphanumeric_internal(remaining: Int, storage: StringBuilder) -> String {
+fn alphanumeric_internal(remaining: Int, storage: StringTree) -> String {
   case remaining == 0 {
-    True -> string_builder.to_string(storage)
+    True -> string_tree.to_string(storage)
 
     False -> {
       let character = get_random_item(characters)
       alphanumeric_internal(
         remaining - 1,
-        string_builder.append(storage, character),
+        string_tree.append(storage, character),
       )
     }
   }
 }
 
-fn with_pattern_internal(
-  given_pattern: String,
-  storage: StringBuilder,
-) -> String {
+fn with_pattern_internal(given_pattern: String, storage: StringTree) -> String {
   case string.first(given_pattern) {
     Ok("%") -> {
       let to_append = case string.slice(given_pattern, 0, 2) {
@@ -165,17 +162,17 @@ fn with_pattern_internal(
         characters -> characters
       }
       with_pattern_internal(
-        string.drop_left(given_pattern, 2),
-        string_builder.append(storage, to_append),
+        string.drop_start(given_pattern, 2),
+        string_tree.append(storage, to_append),
       )
     }
 
     Ok(to_append) ->
       with_pattern_internal(
-        string.drop_left(given_pattern, 1),
-        string_builder.append(storage, to_append),
+        string.drop_start(given_pattern, 1),
+        string_tree.append(storage, to_append),
       )
 
-    Error(Nil) -> string_builder.to_string(storage)
+    Error(Nil) -> string_tree.to_string(storage)
   }
 }