Skip to content

Commit

Permalink
Update to include 'type' in relevant imports
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
michaeljones committed Dec 1, 2023
1 parent 7982ad4 commit 8c30dec
Show file tree
Hide file tree
Showing 35 changed files with 87 additions and 52 deletions.
4 changes: 2 additions & 2 deletions gleam.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion src/renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -21,3 +21,4 @@ pub fn render(name name: StringBuilder) -> String {
string_builder.to_string(render_builder(name: name))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -21,3 +21,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_dot_access.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -30,3 +30,4 @@ pub fn render(user user: MyUser) -> String {
string_builder.to_string(render_builder(user: user))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -29,3 +29,4 @@ pub fn render(is_user is_user: Bool) -> String {
string_builder.to_string(render_builder(is_user: is_user))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -28,3 +28,4 @@ pub fn render(list list: List(Item)) -> String {
string_builder.to_string(render_builder(list: list))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -25,3 +25,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_for_loop.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -28,3 +28,4 @@ pub fn render(list list: List(String)) -> String {
string_builder.to_string(render_builder(list: list))
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_function.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand All @@ -24,3 +24,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand All @@ -25,3 +25,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand All @@ -26,3 +26,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -21,3 +21,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_identifier.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -21,3 +21,4 @@ pub fn render(name name: String) -> String {
string_builder.to_string(render_builder(name: name))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -30,3 +30,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -31,3 +31,4 @@ pub fn render(is_user is_user: Bool) -> String {
string_builder.to_string(render_builder(is_user: is_user))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -30,3 +30,4 @@ pub fn render(is_user is_user: Bool) -> String {
string_builder.to_string(render_builder(is_user: is_user))
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_import.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -19,3 +19,4 @@ pub fn render(name name: String) -> String {
string_builder.to_string(render_builder(name: name))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand All @@ -19,3 +19,4 @@ pub fn render(user user: User) -> String {
string_builder.to_string(render_builder(user: user))
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_multiline.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -32,3 +32,4 @@ pub fn render(my_list my_list: List(String)) -> String {
string_builder.to_string(render_builder(my_list: my_list))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand Down Expand Up @@ -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))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand All @@ -24,3 +24,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_pure_text.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -19,3 +19,4 @@ pub fn render() -> String {
string_builder.to_string(render_builder())
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_quotes.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -21,3 +21,4 @@ pub fn render(name name: String) -> String {
string_builder.to_string(render_builder(name: name))
}


Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -23,3 +23,4 @@ pub fn render(name name: String, adjective adjective: String) -> String {
string_builder.to_string(render_builder(name: name, adjective: adjective))
}


3 changes: 2 additions & 1 deletion src/snapshots/matcha__renderer__test__render_with.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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}



Expand All @@ -19,3 +19,4 @@ pub fn render(user user: User) -> String {
string_builder.to_string(render_builder(user: user))
}


Loading

0 comments on commit 8c30dec

Please sign in to comment.