refactor: Blocks/sources.jl (limited)

Author: ven-k

src/Blocks/sources.jl

@@ -91,13 +91,19 @@ The input variable `t` can be changed by passing a different variable as the key
 # Connectors:
 - `output`
 """
-@component function TimeVaryingFunction(f; t = t, name)
-    @named output = RealOutput()
-    eqs = [
-        output.u ~ f(t),
-    ]
-    compose(ODESystem(eqs, Blocks.t; name = name), [output])
+@mtkmodel TimeVaryingFunction begin
+    @parameters begin
+        f
+        _t
+    end
+    @components begin
+        output = RealOutput()
+    end
+    @equations begin
+        output.u ~ first(getdefault(f))(_t)
+    end
 end
+TimeVaryingFunction.f(f; name, _t) = TimeVaryingFunction.f(; f = [f], name, _t)
 
 """
 Generate sine signal.

test/Blocks/sources.jl

@@ -28,7 +28,7 @@ end
 @testset "TimeVaryingFunction" begin
     f(t) = t^2 + 1
 
-    @named src = TimeVaryingFunction(f)
+    @named src = TimeVaryingFunction(; f, _t = t)
     @named int = Integrator()
     @named iosys = ODESystem([
             connect(src.output, int.input),
@@ -37,7 +37,7 @@ end
         systems = [int, src])
     sys = structural_simplify(iosys)
 
-    prob = ODEProblem(sys, Pair[int.x => 0.0], (0.0, 10.0))
+    prob = ODEProblem(sys, Pair[], (0.0, 10.0))
 
     sol = solve(prob, Rodas4())
     @test sol.retcode == Success