From 8c30deca69635d9dd45bdb438634e9f67591ba04 Mon Sep 17 00:00:00 2001
From: Michael Jones <m.pricejones@gmail.com>
Date: Fri, 1 Dec 2023 19:31:14 +0000
Subject: [PATCH] Update to include 'type' in relevant imports

And bump dependencies which are quite old now.

I've removed 'import gleam/list' from one of the templates as we import
it anyway. It might be an issue if users want to import and use others
parts of gleam/list in their templates. It can probably be worked
around for the moment but something to keep in mind for the future.
---
 gleam.toml                                    |  4 +-
 manifest.toml                                 |  8 ++--
 src/renderer.rs                               |  2 +-
 ..._renderer__test__render_builder_block.snap |  3 +-
 ...erer__test__render_builder_expression.snap |  3 +-
 ...ha__renderer__test__render_dot_access.snap |  3 +-
 ...erer__test__render_empty_if_statement.snap |  3 +-
 ...a__renderer__test__render_for_as_loop.snap |  3 +-
 ...rer__test__render_for_from_expression.snap |  3 +-
 ...tcha__renderer__test__render_for_loop.snap |  3 +-
 ...tcha__renderer__test__render_function.snap |  3 +-
 ...erer__test__render_function_and_usage.snap |  3 +-
 ...t__render_function_with_arg_and_usage.snap |  3 +-
 ...__test__render_function_with_for_loop.snap |  2 +-
 ...nderer__test__render_gleam_expression.snap |  3 +-
 ...ha__renderer__test__render_identifier.snap |  3 +-
 ..._renderer__test__render_if_comparison.snap |  3 +-
 ...derer__test__render_if_else_statement.snap |  3 +-
 ...__renderer__test__render_if_statement.snap |  3 +-
 ...matcha__renderer__test__render_import.snap |  3 +-
 ...enderer__test__render_import_and_with.snap |  3 +-
 ...cha__renderer__test__render_multiline.snap |  3 +-
 ...er__test__render_nested_if_statements.snap |  3 +-
 ...r__test__render_only_public_functions.snap |  2 +-
 ...enderer__test__render_public_function.snap |  3 +-
 ...cha__renderer__test__render_pure_text.snap |  3 +-
 ...matcha__renderer__test__render_quotes.snap |  3 +-
 ...enderer__test__render_two_identifiers.snap |  3 +-
 .../matcha__renderer__test__render_with.snap  |  3 +-
 ...erer__test__repeated_identifier_usage.snap |  3 +-
 test/templates/dot_access.matcha              |  2 +-
 test/templates/for_as_loop.matcha             |  2 +-
 .../templates/for_loop_from_expression.matcha |  3 +-
 test/templates/if_comparison.matcha           |  2 +-
 test/templates_test.gleam                     | 37 ++++++++++++-------
 35 files changed, 87 insertions(+), 52 deletions(-)

diff --git a/gleam.toml b/gleam.toml
index a5e72f9..6724840 100644
--- a/gleam.toml
+++ b/gleam.toml
@@ -10,7 +10,7 @@ version = "0.1.0"
 # links = [{ title = "Website", href = "https://gleam.run" }]
 
 [dependencies]
-gleam_stdlib = "~> 0.18"
+gleam_stdlib = "~> 0.33"
 
 [dev-dependencies]
-gleeunit = "~> 0.5"
+gleeunit = "~> 1.0"
diff --git a/manifest.toml b/manifest.toml
index 2700b86..9418931 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,10 +2,10 @@
 # You typically do not need to edit this file
 
 packages = [
-  { name = "gleam_stdlib", version = "0.18.1", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "763ECD87D54D08755EE4C8551720D122FDCA47F61D1CA8AF23B19A90395A7468" },
-  { name = "gleeunit", version = "0.5.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "F7FA7477D930178C1E59519DBDB5E086BE3A6B65F015B67DA94D30A323062154" },
+  { name = "gleam_stdlib", version = "0.33.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "539E37A2AA5EBE8E75F4B74755E4CC604BD957C3000AC8D705A2024886A2738B" },
+  { name = "gleeunit", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "D3682ED8C5F9CAE1C928F2506DE91625588CC752495988CBE0F5653A42A6F334" },
 ]
 
 [requirements]
-gleam_stdlib = "~> 0.18"
-gleeunit = "~> 0.5"
+gleam_stdlib = { version = "~> 0.33" }
+gleeunit = { version = "~> 1.0" }
diff --git a/src/renderer.rs b/src/renderer.rs
index 3662c03..e4fe3b2 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -82,7 +82,7 @@ pub fn render({params_string}) -> String {{
     let output = format!(
         r#"// DO NOT EDIT: Code generated by {prog_name} from {source_file}
 
-import gleam/string_builder.{{StringBuilder}}
+import gleam/string_builder.{{type StringBuilder}}
 {list_import}
 {import_lines}{functions}
 {render_functions}
diff --git a/src/snapshots/matcha__renderer__test__render_builder_block.snap b/src/snapshots/matcha__renderer__test__render_builder_block.snap
index b538291..f77a796 100644
--- a/src/snapshots/matcha__renderer__test__render_builder_block.snap
+++ b/src/snapshots/matcha__renderer__test__render_builder_block.snap
@@ -4,7 +4,7 @@ expression: "{> with name as StringBuilder\nHello {[ name ]}, good to meet you"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -21,3 +21,4 @@ pub fn render(name name: StringBuilder) -> String {
     string_builder.to_string(render_builder(name: name))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_builder_expression.snap b/src/snapshots/matcha__renderer__test__render_builder_expression.snap
index 375ac0c..9e8dcbc 100644
--- a/src/snapshots/matcha__renderer__test__render_builder_expression.snap
+++ b/src/snapshots/matcha__renderer__test__render_builder_expression.snap
@@ -4,7 +4,7 @@ expression: "Hello {[ string_builder.from_strings([\"Anna\", \" and \", \"Bob\"]
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -21,3 +21,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_dot_access.snap b/src/snapshots/matcha__renderer__test__render_dot_access.snap
index c6cf538..b4e599a 100644
--- a/src/snapshots/matcha__renderer__test__render_dot_access.snap
+++ b/src/snapshots/matcha__renderer__test__render_dot_access.snap
@@ -4,7 +4,7 @@ expression: "{> with user as MyUser\nHello{% if user.is_admin %} Admin{% endif %
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -30,3 +30,4 @@ pub fn render(user user: MyUser) -> String {
     string_builder.to_string(render_builder(user: user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_empty_if_statement.snap b/src/snapshots/matcha__renderer__test__render_empty_if_statement.snap
index 4b4f5d0..e264916 100644
--- a/src/snapshots/matcha__renderer__test__render_empty_if_statement.snap
+++ b/src/snapshots/matcha__renderer__test__render_empty_if_statement.snap
@@ -4,7 +4,7 @@ expression: "{> with is_user as Bool\nHello {% if is_user %}{% endif %}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -29,3 +29,4 @@ pub fn render(is_user is_user: Bool) -> String {
     string_builder.to_string(render_builder(is_user: is_user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_for_as_loop.snap b/src/snapshots/matcha__renderer__test__render_for_as_loop.snap
index e9cd911..9e628d1 100644
--- a/src/snapshots/matcha__renderer__test__render_for_as_loop.snap
+++ b/src/snapshots/matcha__renderer__test__render_for_as_loop.snap
@@ -4,7 +4,7 @@ expression: "{> with list as List(Item)\nHello,{% for item as Item in list %} to
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 import gleam/list
 
 
@@ -28,3 +28,4 @@ pub fn render(list list: List(Item)) -> String {
     string_builder.to_string(render_builder(list: list))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_for_from_expression.snap b/src/snapshots/matcha__renderer__test__render_for_from_expression.snap
index bad2ead..89b7103 100644
--- a/src/snapshots/matcha__renderer__test__render_for_from_expression.snap
+++ b/src/snapshots/matcha__renderer__test__render_for_from_expression.snap
@@ -4,7 +4,7 @@ expression: "Hello {% for item as Item in list.take(list, 2) %}{{ item }}{% endf
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 import gleam/list
 
 
@@ -25,3 +25,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_for_loop.snap b/src/snapshots/matcha__renderer__test__render_for_loop.snap
index a2ccafa..2410f81 100644
--- a/src/snapshots/matcha__renderer__test__render_for_loop.snap
+++ b/src/snapshots/matcha__renderer__test__render_for_loop.snap
@@ -4,7 +4,7 @@ expression: "{> with list as List(String)\nHello,{% for item in list %} to {{ it
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 import gleam/list
 
 
@@ -28,3 +28,4 @@ pub fn render(list list: List(String)) -> String {
     string_builder.to_string(render_builder(list: list))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_function.snap b/src/snapshots/matcha__renderer__test__render_function.snap
index c85b1f8..df05cc6 100644
--- a/src/snapshots/matcha__renderer__test__render_function.snap
+++ b/src/snapshots/matcha__renderer__test__render_function.snap
@@ -4,7 +4,7 @@ expression: "{> fn classes()\na b c d\n{> endfn\nHello world"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 fn classes() -> StringBuilder {
     let builder = string_builder.from_string("")
@@ -24,3 +24,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_function_and_usage.snap b/src/snapshots/matcha__renderer__test__render_function_and_usage.snap
index ed0d719..90d577c 100644
--- a/src/snapshots/matcha__renderer__test__render_function_and_usage.snap
+++ b/src/snapshots/matcha__renderer__test__render_function_and_usage.snap
@@ -4,7 +4,7 @@ expression: "{> fn name()\nLucy\n{> endfn\nHello {[ name() ]}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 fn name() -> StringBuilder {
     let builder = string_builder.from_string("")
@@ -25,3 +25,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_function_with_arg_and_usage.snap b/src/snapshots/matcha__renderer__test__render_function_with_arg_and_usage.snap
index a2818a9..dd52d55 100644
--- a/src/snapshots/matcha__renderer__test__render_function_with_arg_and_usage.snap
+++ b/src/snapshots/matcha__renderer__test__render_function_with_arg_and_usage.snap
@@ -4,7 +4,7 @@ expression: "{> fn full_name(second_name: String)\nLucy {{ second_name }}\n{> en
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 fn full_name(second_name: String) -> StringBuilder {
     let builder = string_builder.from_string("")
@@ -26,3 +26,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_function_with_for_loop.snap b/src/snapshots/matcha__renderer__test__render_function_with_for_loop.snap
index 903f509..de722a1 100644
--- a/src/snapshots/matcha__renderer__test__render_function_with_for_loop.snap
+++ b/src/snapshots/matcha__renderer__test__render_function_with_for_loop.snap
@@ -4,7 +4,7 @@ expression: "{> fn full_name(names: List(String))\n{% for name in names %}{{ nam
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 import gleam/list
 
 fn full_name(names: List(String)) -> StringBuilder {
diff --git a/src/snapshots/matcha__renderer__test__render_gleam_expression.snap b/src/snapshots/matcha__renderer__test__render_gleam_expression.snap
index b2a407a..f2b3db9 100644
--- a/src/snapshots/matcha__renderer__test__render_gleam_expression.snap
+++ b/src/snapshots/matcha__renderer__test__render_gleam_expression.snap
@@ -4,7 +4,7 @@ expression: "{> import gleam/string\nHello {{ string.uppercase(name) }}, good to
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 import gleam/string
 
@@ -21,3 +21,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_identifier.snap b/src/snapshots/matcha__renderer__test__render_identifier.snap
index 2a77a54..59442c4 100644
--- a/src/snapshots/matcha__renderer__test__render_identifier.snap
+++ b/src/snapshots/matcha__renderer__test__render_identifier.snap
@@ -4,7 +4,7 @@ expression: "{> with name as String\nHello {{ name }}, good to meet you"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -21,3 +21,4 @@ pub fn render(name name: String) -> String {
     string_builder.to_string(render_builder(name: name))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_if_comparison.snap b/src/snapshots/matcha__renderer__test__render_if_comparison.snap
index 8c71430..7b1cf71 100644
--- a/src/snapshots/matcha__renderer__test__render_if_comparison.snap
+++ b/src/snapshots/matcha__renderer__test__render_if_comparison.snap
@@ -4,7 +4,7 @@ expression: "Hello {% if items != [] %}Some items{% endif %}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -30,3 +30,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_if_else_statement.snap b/src/snapshots/matcha__renderer__test__render_if_else_statement.snap
index a320cb7..d9838a4 100644
--- a/src/snapshots/matcha__renderer__test__render_if_else_statement.snap
+++ b/src/snapshots/matcha__renderer__test__render_if_else_statement.snap
@@ -4,7 +4,7 @@ expression: "{> with is_user as Bool\nHello {% if is_user %}User{% else %}Unknow
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -31,3 +31,4 @@ pub fn render(is_user is_user: Bool) -> String {
     string_builder.to_string(render_builder(is_user: is_user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_if_statement.snap b/src/snapshots/matcha__renderer__test__render_if_statement.snap
index 815437c..ceb4ca7 100644
--- a/src/snapshots/matcha__renderer__test__render_if_statement.snap
+++ b/src/snapshots/matcha__renderer__test__render_if_statement.snap
@@ -4,7 +4,7 @@ expression: "{> with is_user as Bool\nHello {% if is_user %}User{% endif %}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -30,3 +30,4 @@ pub fn render(is_user is_user: Bool) -> String {
     string_builder.to_string(render_builder(is_user: is_user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_import.snap b/src/snapshots/matcha__renderer__test__render_import.snap
index eb06a6b..7cf2879 100644
--- a/src/snapshots/matcha__renderer__test__render_import.snap
+++ b/src/snapshots/matcha__renderer__test__render_import.snap
@@ -4,7 +4,7 @@ expression: "{> import user.{User}\n{> with name as String\n{{ name }}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 import user.{User}
 
@@ -19,3 +19,4 @@ pub fn render(name name: String) -> String {
     string_builder.to_string(render_builder(name: name))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_import_and_with.snap b/src/snapshots/matcha__renderer__test__render_import_and_with.snap
index 1992a59..24803d2 100644
--- a/src/snapshots/matcha__renderer__test__render_import_and_with.snap
+++ b/src/snapshots/matcha__renderer__test__render_import_and_with.snap
@@ -4,7 +4,7 @@ expression: "{> import user.{User}\n{> with user as User\n{{ user }}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 import user.{User}
 
@@ -19,3 +19,4 @@ pub fn render(user user: User) -> String {
     string_builder.to_string(render_builder(user: user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_multiline.snap b/src/snapshots/matcha__renderer__test__render_multiline.snap
index df545d8..8c0ae5a 100644
--- a/src/snapshots/matcha__renderer__test__render_multiline.snap
+++ b/src/snapshots/matcha__renderer__test__render_multiline.snap
@@ -4,7 +4,7 @@ expression: "{> with my_list as List(String)\n<ul>\n{% for entry in my_list %}\n
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 import gleam/list
 
 
@@ -32,3 +32,4 @@ pub fn render(my_list my_list: List(String)) -> String {
     string_builder.to_string(render_builder(my_list: my_list))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_nested_if_statements.snap b/src/snapshots/matcha__renderer__test__render_nested_if_statements.snap
index 457d47d..0019fdd 100644
--- a/src/snapshots/matcha__renderer__test__render_nested_if_statements.snap
+++ b/src/snapshots/matcha__renderer__test__render_nested_if_statements.snap
@@ -4,7 +4,7 @@ expression: "{> with is_user as Bool\n{> with is_admin as Bool\nHello {% if is_u
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -41,3 +41,4 @@ pub fn render(is_user is_user: Bool, is_admin is_admin: Bool) -> String {
     string_builder.to_string(render_builder(is_user: is_user, is_admin: is_admin))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_only_public_functions.snap b/src/snapshots/matcha__renderer__test__render_only_public_functions.snap
index b8a2928..f620c92 100644
--- a/src/snapshots/matcha__renderer__test__render_only_public_functions.snap
+++ b/src/snapshots/matcha__renderer__test__render_only_public_functions.snap
@@ -4,7 +4,7 @@ expression: "\n{> pub fn classes()\n    a b c d\n{> endfn\n\n{> pub fn item(name
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 pub fn classes() -> StringBuilder {
     let builder = string_builder.from_string("")
diff --git a/src/snapshots/matcha__renderer__test__render_public_function.snap b/src/snapshots/matcha__renderer__test__render_public_function.snap
index c81a75c..368d45b 100644
--- a/src/snapshots/matcha__renderer__test__render_public_function.snap
+++ b/src/snapshots/matcha__renderer__test__render_public_function.snap
@@ -4,7 +4,7 @@ expression: "{> pub fn classes()\na b c d\n{> endfn\nHello world"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 pub fn classes() -> StringBuilder {
     let builder = string_builder.from_string("")
@@ -24,3 +24,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_pure_text.snap b/src/snapshots/matcha__renderer__test__render_pure_text.snap
index 67ae230..ff48760 100644
--- a/src/snapshots/matcha__renderer__test__render_pure_text.snap
+++ b/src/snapshots/matcha__renderer__test__render_pure_text.snap
@@ -4,7 +4,7 @@ expression: "Hello name, good to meet you"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -19,3 +19,4 @@ pub fn render() -> String {
     string_builder.to_string(render_builder())
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_quotes.snap b/src/snapshots/matcha__renderer__test__render_quotes.snap
index 5eb4b1d..95578a4 100644
--- a/src/snapshots/matcha__renderer__test__render_quotes.snap
+++ b/src/snapshots/matcha__renderer__test__render_quotes.snap
@@ -4,7 +4,7 @@ expression: "{> with name as String\n<div class=\"my-class\">{{ name }}</div>"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -21,3 +21,4 @@ pub fn render(name name: String) -> String {
     string_builder.to_string(render_builder(name: name))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_two_identifiers.snap b/src/snapshots/matcha__renderer__test__render_two_identifiers.snap
index e90a0a5..00f9c83 100644
--- a/src/snapshots/matcha__renderer__test__render_two_identifiers.snap
+++ b/src/snapshots/matcha__renderer__test__render_two_identifiers.snap
@@ -4,7 +4,7 @@ expression: "{> with name as String\n{> with adjective as String\nHello {{ name
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -23,3 +23,4 @@ pub fn render(name name: String, adjective adjective: String) -> String {
     string_builder.to_string(render_builder(name: name, adjective: adjective))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__render_with.snap b/src/snapshots/matcha__renderer__test__render_with.snap
index cc58c19..3c941fb 100644
--- a/src/snapshots/matcha__renderer__test__render_with.snap
+++ b/src/snapshots/matcha__renderer__test__render_with.snap
@@ -4,7 +4,7 @@ expression: "{> with user as User\n{{ user }}"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -19,3 +19,4 @@ pub fn render(user user: User) -> String {
     string_builder.to_string(render_builder(user: user))
 }
 
+
diff --git a/src/snapshots/matcha__renderer__test__repeated_identifier_usage.snap b/src/snapshots/matcha__renderer__test__repeated_identifier_usage.snap
index 2574647..d0a407e 100644
--- a/src/snapshots/matcha__renderer__test__repeated_identifier_usage.snap
+++ b/src/snapshots/matcha__renderer__test__repeated_identifier_usage.snap
@@ -4,7 +4,7 @@ expression: "{> with name as String\n{{ name }} usage, {{ name }} usage"
 ---
 // DO NOT EDIT: Code generated by matcha from -test-
 
-import gleam/string_builder.{StringBuilder}
+import gleam/string_builder.{type StringBuilder}
 
 
 
@@ -22,3 +22,4 @@ pub fn render(name name: String) -> String {
     string_builder.to_string(render_builder(name: name))
 }
 
+
diff --git a/test/templates/dot_access.matcha b/test/templates/dot_access.matcha
index a396ded..671976d 100644
--- a/test/templates/dot_access.matcha
+++ b/test/templates/dot_access.matcha
@@ -1,3 +1,3 @@
-{> import my_user.{User}
+{> import my_user.{type User}
 {> with user_obj as User
 Hello{% if user_obj.is_admin %} Admin{% endif %}
diff --git a/test/templates/for_as_loop.matcha b/test/templates/for_as_loop.matcha
index 352a120..4bdfd79 100644
--- a/test/templates/for_as_loop.matcha
+++ b/test/templates/for_as_loop.matcha
@@ -1,3 +1,3 @@
-{> import my_user.{NamedUser}
+{> import my_user.{type NamedUser}
 {> with users as List(NamedUser)
 Hello,{% for user as NamedUser in users %} to {{ user.name }} and{% endfor %} everyone else
diff --git a/test/templates/for_loop_from_expression.matcha b/test/templates/for_loop_from_expression.matcha
index e3b1267..621ce09 100644
--- a/test/templates/for_loop_from_expression.matcha
+++ b/test/templates/for_loop_from_expression.matcha
@@ -1,5 +1,4 @@
-{> import gleam/list
-{> import my_user.{NamedUser}
+{> import my_user.{type NamedUser}
 {> with users as List(NamedUser)
 {> with limit as Int
 Hello,{% for user as NamedUser in list.take(users, limit) %} to {{ user.name }} and{% endfor %} everyone else
diff --git a/test/templates/if_comparison.matcha b/test/templates/if_comparison.matcha
index 115a7a9..2daa7fc 100644
--- a/test/templates/if_comparison.matcha
+++ b/test/templates/if_comparison.matcha
@@ -1,3 +1,3 @@
-{> import my_user.{User}
+{> import my_user.{type User}
 {> with users as List(User)
 Hello{% if users != [] %} Users{% endif %}
diff --git a/test/templates_test.gleam b/test/templates_test.gleam
index 89b9838..55ff491 100644
--- a/test/templates_test.gleam
+++ b/test/templates_test.gleam
@@ -1,8 +1,6 @@
 import gleam/string_builder
-
 import gleeunit
 import gleeunit/should
-
 import templates/identifier
 import templates/two_identifiers
 import templates/double_identifier_usage
@@ -24,8 +22,7 @@ import templates/builder_expression
 import templates/function_with_arg
 import templates/function_html
 import templates/use_pub_function
-
-import my_user.{User, NamedUser}
+import my_user.{NamedUser, User}
 
 pub fn main() {
   gleeunit.main()
@@ -113,7 +110,9 @@ pub fn nested_if_statement_test() {
 
 pub fn for_loop_test() {
   for_loop.render(["Anna", "Bill", "Christine"])
-  |> should.equal("Hello, to Anna and to Bill and to Christine and everyone else\n")
+  |> should.equal(
+    "Hello, to Anna and to Bill and to Christine and everyone else\n",
+  )
 
   for_loop.render([])
   |> should.equal("Hello, everyone else\n")
@@ -125,13 +124,20 @@ pub fn for_as_loop_test() {
 }
 
 pub fn for_loop_from_expression_test() {
-  for_loop_from_expression.render(users: [NamedUser("Anna"), NamedUser("Bill"), NamedUser("Christine")], limit: 2)
+  for_loop_from_expression.render(
+    users: [NamedUser("Anna"), NamedUser("Bill"), NamedUser("Christine")],
+    limit: 2,
+  )
   |> should.equal("Hello, to Anna and to Bill and everyone else\n")
 }
 
 pub fn value_in_for_loop_test() {
-  value_in_for_loop.render(greeting: "Hello", my_list: ["Anna", "Bill", "Christine"])
-  |> should.equal("<h1>My List</h1>
+  value_in_for_loop.render(
+    greeting: "Hello",
+    my_list: ["Anna", "Bill", "Christine"],
+  )
+  |> should.equal(
+    "<h1>My List</h1>
 <ul>
 
     <li>Hello Anna</li>
@@ -141,7 +147,8 @@ pub fn value_in_for_loop_test() {
     <li>Hello Christine</li>
 
 </ul>
-")
+",
+  )
 }
 
 pub fn dot_access_test() {
@@ -156,7 +163,8 @@ pub fn dot_access_test() {
 
 pub fn multiline_test() {
   multiline.render(["Anna", "Bill", "Christine"])
-  |> should.equal("<h1>My List</h1>
+  |> should.equal(
+    "<h1>My List</h1>
 <ul>
 
     <li>Anna</li>
@@ -166,7 +174,8 @@ pub fn multiline_test() {
     <li>Christine</li>
 
 </ul>
-")
+",
+  )
 }
 
 pub fn quote_test() {
@@ -179,11 +188,13 @@ pub fn function_test() {
   |> should.equal("Hello Lucy Gleam\n")
 
   function_html.render()
-  |> should.equal("<ul>
+  |> should.equal(
+    "<ul>
     <li class=\"px-2 py-1 font-bold\">Alice</li>
     <li class=\"px-2 py-1 font-bold\">Bob</li>
     <li class=\"px-2 py-1 font-bold\">Cary</li>
-</ul>\n")
+</ul>\n",
+  )
 
   use_pub_function.render()
   |> should.equal("Hello Lucy, welcome to the test suite.\n")