Remove Sketch dependency

Author: ghivert

e2e/demo/manifest.toml

@@ -25,7 +25,7 @@ packages = [
   { name = "glint", version = "1.2.1", build_tools = ["gleam"], requirements = ["gleam_community_ansi", "gleam_community_colour", "gleam_stdlib", "snag"], otp_app = "glint", source = "hex", outer_checksum = "2214C7CEFDE457CEE62140C3D4899B964E05236DA74E4243DFADF4AF29C382BB" },
   { name = "glisten", version = "7.0.1", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_otp", "gleam_stdlib", "logging", "telemetry"], otp_app = "glisten", source = "hex", outer_checksum = "1A53CF9FB3231A93FF7F1BD519A43DC968C1722F126CDD278403A78725FC5189" },
   { name = "gramps", version = "3.0.1", build_tools = ["gleam"], requirements = ["gleam_crypto", "gleam_erlang", "gleam_http", "gleam_stdlib"], otp_app = "gramps", source = "hex", outer_checksum = "59194B3980110B403EE6B75330DB82CDE05FC8138491C2EAEACBC7AAEF30B2E8" },
-  { name = "grille_pain", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib", "lustre", "sketch", "sketch_lustre"], source = "local", path = "../.." },
+  { name = "grille_pain", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib", "lustre"], source = "local", path = "../.." },
   { name = "hpack_erl", version = "0.3.0", build_tools = ["rebar3"], requirements = [], otp_app = "hpack", source = "hex", outer_checksum = "D6137D7079169D8C485C6962DFE261AF5B9EF60FBC557344511C1E65E3D95FB0" },
   { name = "logging", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "logging", source = "hex", outer_checksum = "1098FBF10B54B44C2C7FDF0B01C1253CAFACDACABEFB4B0D027803246753E06D" },
   { name = "lustre", version = "4.6.4", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_json", "gleam_otp", "gleam_stdlib"], otp_app = "lustre", source = "hex", outer_checksum = "CC59564624A4A1D855B5FEB55D979A072B328D0368E82A1639F180840D6288E9" },

e2e/demo/src/demo.gleam

@@ -3,7 +3,6 @@ import gleam/list
 import gleam/pair
 import gleam/result
 import grille_pain
-import grille_pain/internals/view/theme
 import grille_pain/lustre/toast
 import grille_pain/toast/level
 import layout
@@ -106,31 +105,31 @@ fn simple_toasts() {
     ]),
     layout.actions_wrapper([], [
       layout.toast_button(
-        theme.light,
+        "#fff",
         layout.palette.black,
         [event.on_click(DisplayBasicToast("Toast", toast.toast))],
         [html.text("Toast")],
       ),
       layout.toast_button(
-        theme.success,
+        "#07bc0c",
         layout.palette.white,
         [event.on_click(DisplayBasicToast("Success", toast.success))],
         [html.text("Success")],
       ),
       layout.toast_button(
-        theme.info,
+        "#3498db",
         layout.palette.white,
         [event.on_click(DisplayBasicToast("Info", toast.info))],
         [html.text("Info")],
       ),
       layout.toast_button(
-        theme.warning,
+        "#f1c40f",
         layout.palette.white,
         [event.on_click(DisplayBasicToast("Warning", toast.warning))],
         [html.text("Warning")],
       ),
       layout.toast_button(
-        theme.error,
+        "#e74c3c",
         layout.palette.white,
         [event.on_click(DisplayBasicToast("Error", toast.error))],
         [html.text("Error")],
@@ -162,31 +161,31 @@ fn custom_toasts(model: Model) {
     ]),
     layout.actions_wrapper([], [
       layout.toast_button(
-        theme.light,
+        "#fff",
         layout.palette.black,
         [event.on_click(DisplayCustomToast(level.Standard))],
         [html.text("Toast")],
       ),
       layout.toast_button(
-        theme.success,
+        "#07bc0c",
         layout.palette.white,
         [event.on_click(DisplayCustomToast(level.Success))],
         [html.text("Success")],
       ),
       layout.toast_button(
-        theme.info,
+        "#3498db",
         layout.palette.white,
         [event.on_click(DisplayCustomToast(level.Info))],
         [html.text("Info")],
       ),
       layout.toast_button(
-        theme.warning,
+        "#f1c40f",
         layout.palette.white,
         [event.on_click(DisplayCustomToast(level.Warning))],
         [html.text("Warning")],
       ),
       layout.toast_button(
-        theme.error,
+        "#e74c3c",
         layout.palette.white,
         [event.on_click(DisplayCustomToast(level.Error))],
         [html.text("Error")],
@@ -205,31 +204,31 @@ fn sticky_toasts() {
     ]),
     layout.actions_wrapper([], [
       layout.toast_button(
-        theme.light,
+        "#fff",
         layout.palette.black,
         [event.on_click(DisplayStickyToast(level.Standard))],
         [html.text("Toast")],
       ),
       layout.toast_button(
-        theme.success,
+        "#07bc0c",
         layout.palette.white,
         [event.on_click(DisplayStickyToast(level.Success))],
         [html.text("Success")],
       ),
       layout.toast_button(
-        theme.info,
+        "#3498db",
         layout.palette.white,
         [event.on_click(DisplayStickyToast(level.Info))],
         [html.text("Info")],
       ),
       layout.toast_button(
-        theme.warning,
+        "#f1c40f",
         layout.palette.white,
         [event.on_click(DisplayStickyToast(level.Warning))],
         [html.text("Warning")],
       ),
       layout.toast_button(
-        theme.error,
+        "#e74c3c",
         layout.palette.white,
         [event.on_click(DisplayStickyToast(level.Error))],
         [html.text("Error")],
@@ -238,7 +237,7 @@ fn sticky_toasts() {
     html.br_([]),
     layout.actions_wrapper([], [
       layout.toast_button(
-        theme.error,
+        "#e74c3c",
         layout.palette.white,
         [event.on_click(HideStickyToasts)],
         [html.text("Hide sticky toasts")],

gleam.toml

@@ -13,8 +13,6 @@ repository = {type = "github", user = "ghivert", repo = "grille-pain"}
 [dependencies]
 gleam_stdlib = ">= 0.54.0 and < 1.0.0"
 lustre = ">= 4.5.0 and < 5.0.0"
-sketch = ">= 4.0.0 and < 5.0.0"
-sketch_lustre = ">= 2.0.0 and < 3.0.0"
 
 [dev-dependencies]
 gleeunit = ">= 1.0.0 and < 2.0.0"

manifest.toml

@@ -8,13 +8,9 @@ packages = [
   { name = "gleam_stdlib", version = "0.58.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "091F2D2C4A3A4E2047986C47E2C2C9D728A4E068ABB31FDA17B0D347E6248467" },
   { name = "gleeunit", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "0E6C83834BA65EDCAAF4FE4FB94AC697D9262D83E6F58A750D63C9F6C8A9D9FF" },
   { name = "lustre", version = "4.6.4", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_json", "gleam_otp", "gleam_stdlib"], otp_app = "lustre", source = "hex", outer_checksum = "CC59564624A4A1D855B5FEB55D979A072B328D0368E82A1639F180840D6288E9" },
-  { name = "sketch", version = "4.0.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_otp", "gleam_stdlib"], otp_app = "sketch", source = "hex", outer_checksum = "AF090E77F6FD02467DABD8F0EDC1C329482853698FE6DB33B86D7D05C1BE32F4" },
-  { name = "sketch_lustre", version = "2.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib", "lustre", "sketch"], otp_app = "sketch_lustre", source = "hex", outer_checksum = "7F8CE798F2D3989D45DA4D4EDF0ABCE7EB84F5E6236A7C2F5A3AE8095FC9DDFF" },
 ]
 
 [requirements]
 gleam_stdlib = { version = ">= 0.54.0 and < 1.0.0" }
 gleeunit = { version = ">= 1.0.0 and < 2.0.0" }
 lustre = { version = ">= 4.5.0 and < 5.0.0" }
-sketch = { version = ">= 4.0.0 and < 5.0.0" }
-sketch_lustre = { version = ">= 2.0.0 and < 3.0.0" }

src/grille_pain.gleam

@@ -15,8 +15,10 @@ import grille_pain/internals/data/model.{type Model, Model}
 import grille_pain/internals/data/msg.{type Msg}
 import grille_pain/internals/data/toast
 import grille_pain/internals/effect_manager
+import grille_pain/internals/global
 import grille_pain/internals/lustre/schedule.{schedule}
 import grille_pain/internals/setup
+import grille_pain/internals/view
 import grille_pain/options.{type Options}
 import lustre
 import lustre/effect
@@ -26,10 +28,9 @@ import lustre/effect
 /// Use `grille_pain/options` to provide and customise options.
 pub fn setup(opts: Options) {
   use #(lustre_root, shadow) <- result.try(setup.mount())
-  use view <- result.try(setup.view(shadow))
   use dispatcher <- result.map({
     fn(_) { #(model.new(shadow, opts.timeout), effect.none()) }
-    |> lustre.application(update, view)
+    |> lustre.application(update, view.view)
     |> lustre.start(lustre_root, Nil)
     |> error.lustre
   })
@@ -149,7 +150,7 @@ fn update_display(model: Model) {
       use dispatch <- effect.from()
       dispatch({
         msg.LustreRequestedAnimationFrame({
-          use <- request_animation_frame()
+          use <- global.request_animation_frame()
           dispatch(msg.BrowserUpdatedToasts)
         })
       })
@@ -164,13 +165,10 @@ fn update_toasts(model: Model) {
       use dispatch <- effect.from()
       dispatch({
         msg.LustreRequestedAnimationFrame({
-          use <- request_animation_frame()
+          use <- global.request_animation_frame()
           dispatch(msg.LustreComputedToasts)
         })
       })
     }
   }
 }
-
-@external(javascript, "./global.ffi.mjs", "requestAnimationFrame")
-fn request_animation_frame(next: fn() -> Nil) -> model.AnimationFrame

src/grille_pain/error.gleam

@@ -1,17 +1,11 @@
 import gleam/result
 import lustre
-import sketch/error
 
 pub type GrillePainError {
-  SketchError(error.SketchError)
   LustreError(lustre.Error)
   ContextError(String)
 }
 
-pub fn sketch(res: Result(a, error.SketchError)) {
-  result.map_error(res, SketchError)
-}
-
 pub fn lustre(res: Result(a, lustre.Error)) {
   result.map_error(res, LustreError)
 }

src/grille_pain/internals/data/model.gleam

@@ -5,15 +5,13 @@ import grille_pain/internals/global
 import grille_pain/internals/shadow.{type Shadow}
 import grille_pain/toast/level.{type Level}
 
-pub type AnimationFrame
-
 pub type Model {
   Model(
     toasts: List(Toast),
     id: Int,
     timeout: Int,
     root: Shadow,
-    next_frame: Option(AnimationFrame),
+    next_frame: Option(global.AnimationFrame),
     to_show: List(ToShow),
   )
 }

src/grille_pain/internals/data/msg.gleam

@@ -1,11 +1,11 @@
 import gleam/option.{type Option}
-import grille_pain/internals/data/model
+import grille_pain/internals/global
 import grille_pain/toast/level.{type Level}
 
 pub type Msg {
   BrowserUpdatedToasts
   LustreComputedToasts
-  LustreRequestedAnimationFrame(model.AnimationFrame)
+  LustreRequestedAnimationFrame(global.AnimationFrame)
   ToastHidDisplay(id: Int)
   ToastTimedOut(id: Int, iteration: Int)
   UserAddedToast(

src/grille_pain/toast.ffi.mjs renamed to src/grille_pain/internals/data/toast.ffi.mjs

@@ -69,16 +69,21 @@ pub fn by_iteration(toast: Toast, id: Int, iteration: Int) {
   toast.id == id && toast.iteration == iteration
 }
 
-@external(javascript, "../../../toast.ffi.mjs", "computeToastSize")
+@external(javascript, "./toast.ffi.mjs", "computeToastSize")
 pub fn compute_size(_id: Int, _root: Shadow) -> Int {
   // That function can probably never be reached, since `grille_paint` will
   // never be instanciated on the BEAM.
   0
 }
 
-@external(javascript, "../../../toast.ffi.mjs", "computeBottomPosition")
+@external(javascript, "./toast.ffi.mjs", "computeBottomPosition")
 pub fn compute_bottom_position(_root: Shadow, _id: Int) -> Int {
   // That function can probably never be reached, since `grille_paint` will
   // never be instanciated on the BEAM.
   0
 }
+
+@external(javascript, "./toast.ffi.mjs", "uuid")
+pub fn uuid() -> String {
+  ""
+}