Better label2indexing. Fixes #74

Author: jonniedie

Project.toml

@@ -1,7 +1,7 @@
 name = "ComponentArrays"
 uuid = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
 authors = ["Jonnie Diegelman <47193959+jonniedie@users.noreply.github.com>"]
-version = "0.9.1"
+version = "0.9.2"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/plot_utils.jl

@@ -84,5 +84,12 @@ julia> label2index(x, "b[1]")
 
 see also `labels`
 """
-label2index(x::ComponentVector, str::AbstractString) = label2index(labels(x), str)
-label2index(labs, str::AbstractString) = findall(startswith.(labs, str))
+label2index(x::ComponentVector, str) = label2index(labels(x), str)
+function label2index(labs, str)
+    idx = findall(startswith.(labs, str * r"(\.|\[)"))
+    if !isempty(idx)
+        return idx
+    else
+        return [findfirst(l -> l .== str, labs)]
+    end
+end

test/runtests.jl

@@ -392,6 +392,16 @@ end
         "c.b[2,2]",
     ]
     @test label2index(ca2, "c.b") == collect(11:14)
+
+    # Issue #74
+    lab2 = labels(ComponentArray(a=1, aa=ones(2), ab=[(a=1, aa=ones(2)), (a=1, aa=ones(2))], ac=(a=1, ab=ones(2,2))))
+    @test label2index(lab2, "a") == [1]
+    @test label2index(lab2, "aa") == collect(2:3)
+    @test label2index(lab2, "ab") == collect(4:9)
+    @test label2index(lab2, "ab[1].aa") == collect(5:6)
+    @test label2index(lab2, "ac") == collect(10:14)
+    @test label2index(lab2, "ac.a") == [10]
+    @test label2index(lab2, "ac.ab") == collect(11:14)
 end
 
 @testset "Uncategorized Issues" begin