exclude empty mixins from being included

GenieFramework · Nov 29, 2023 · bac3368 · bac3368
1 parent d746977
commit bac3368
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Stipple.jl b/src/Stipple.jl
@@ -766,7 +766,8 @@ function injectdeps(output::Vector{AbstractString}, M::Type{<:ReactiveModel}) ::
     mixinfields = fieldnames(Stipple.get_concrete_type(mixin))
     # if all fields are already part of the model, don't include data
     mode = isempty(setdiff(mixinfields, modelfields)) ? :mixindeps : :mixin
-    push!(output, mixin_dep(mixin; mode)())
+    out = mixin_dep(mixin; mode)()
+    out === nothing || push!(output, out)
   end
   output
 end

diff --git a/src/stipple/rendering.jl b/src/stipple/rendering.jl
@@ -169,7 +169,12 @@ function get_mixins(app::ReactiveModel)::Vector{ReactiveModel}
 end
 
 function mixin_dep(Mixin::Type{<:ReactiveModel}; mode::Symbol = :mixindeps)
-  mixin_dep() = script("const $(nameof(Mixin)) = $(strip(json(render(Mixin(); mode)), '"'))\n")
+  mix = strip(json(render(Mixin(); mode)), '"')
+  mixin_dep() = if mix == "{}"
+    nothing
+  else
+    script("const $(nameof(Mixin)) = $mix\n")
+  end
 end