fix: fix getproperty, hasproperty for simplified hierarchical systems

Author: AayushSabharwal

src/systems/abstractsystem.jl

@@ -933,7 +933,7 @@ function complete(sys::AbstractSystem; split = true)
     end
     if split && has_index_cache(sys)
         @set! sys.index_cache = IndexCache(sys)
-        all_ps = parameters(sys)
+        all_ps = get_ps(sys)
         if !isempty(all_ps)
             # reorder parameters by portions
             ps_split = reorder_parameters(sys, all_ps)
@@ -1102,6 +1102,9 @@ function Base.propertynames(sys::AbstractSystem; private = false)
     if private
         return fieldnames(typeof(sys))
     else
+        if has_parent(sys) && (parent = get_parent(sys); parent !== nothing)
+            sys = parent
+        end
         names = Symbol[]
         for s in get_systems(sys)
             push!(names, getname(s))
@@ -1144,20 +1147,6 @@ function getvar(sys::AbstractSystem, name::Symbol; namespace = !iscomplete(sys))
         avs = get_var_to_name(sys)
         v = get(avs, name, nothing)
         v === nothing || return namespace ? renamespace(sys, v) : v
-    else
-        sts = get_unknowns(sys)
-        i = findfirst(x -> getname(x) == name, sts)
-        if i !== nothing
-            return namespace ? renamespace(sys, sts[i]) : sts[i]
-        end
-
-        if has_ps(sys)
-            ps = get_ps(sys)
-            i = findfirst(x -> getname(x) == name, ps)
-            if i !== nothing
-                return namespace ? renamespace(sys, ps[i]) : ps[i]
-            end
-        end
     end
 
     sts = get_unknowns(sys)
@@ -1166,6 +1155,14 @@ function getvar(sys::AbstractSystem, name::Symbol; namespace = !iscomplete(sys))
         return namespace ? renamespace(sys, sts[i]) : sts[i]
     end
 
+    if has_ps(sys)
+        ps = get_ps(sys)
+        i = findfirst(x -> getname(x) == name, ps)
+        if i !== nothing
+            return namespace ? renamespace(sys, ps[i]) : ps[i]
+        end
+    end
+
     if has_observed(sys)
         obs = get_observed(sys)
         i = findfirst(x -> getname(x.lhs) == name, obs)

test/components.jl

@@ -314,3 +314,39 @@ sol = solve(prob, Tsit5())
     end
     @test string(Base.doc(Pin2)) == "Hey there, Pin2!\n"
 end
+
+@testset "Issue#3016 Hierarchical indexing" begin
+    @mtkmodel Inner begin
+        @parameters begin
+            p
+        end
+    end
+    @mtkmodel Outer begin
+        @components begin
+            inner = Inner()
+        end
+        @variables begin
+            x(t)
+        end
+        @equations begin
+            x ~ inner.p
+        end
+    end
+
+    @named outer = Outer()
+    simp = structural_simplify(outer)
+
+    @test sort(propertynames(outer)) == [:inner, :t, :x]
+    @test propertynames(simp) == propertynames(outer)
+    @test sort(propertynames(outer.inner)) == [:p, :t]
+    @test propertynames(simp.inner) == propertynames(outer.inner)
+
+    for sym in (:t, :x)
+        @test_nowarn getproperty(simp, sym)
+        @test_nowarn getproperty(outer, sym)
+    end
+    @test_nowarn simp.inner.p
+    @test_nowarn outer.inner.p
+    @test_throws ArgumentError simp.inner₊p
+    @test_throws ArgumentError outer.inner₊p
+end