Added to_index and to_indices methods. Fixes #58

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.8.10"
+version = "0.8.11"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"

src/set_get.jl

@@ -5,6 +5,12 @@
 getaxes(x) = ()
 
 
+# Since we aren't really using the standard approach to indexing, this will forward things to
+# the correct methods
+Base.to_indices(x::ComponentArray, i::Tuple) = i
+Base.to_indices(x::ComponentArray, i::Tuple{Vararg{Union{Integer, CartesianIndex}, N}}) where N = i
+Base.to_index(x::ComponentArray, i) = i
+
 # Get AbstractAxis index
 @inline Base.getindex(::AbstractAxis, idx::FlatIdx) = ComponentIndex(idx)
 @inline Base.getindex(ax::AbstractAxis, ::Colon) = ComponentIndex(:, ax)
@@ -15,8 +21,7 @@ getaxes(x) = ()
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, idx::CartesianIndex) = getdata(x)[idx]
 Base.@propagate_inbounds Base.getindex(x::ComponentArray, idx::FlatIdx...) = getdata(x)[idx...]
 Base.@propagate_inbounds function Base.getindex(x::ComponentArray, idx::FlatOrColonIdx...)
-    ci = getindex.(getaxes(x), idx)
-    axs = map(i -> i.ax, ci)
+    axs = map((ax, i) -> getindex(ax, i).ax, getaxes(x), idx)
     axs = remove_nulls(axs...)
     return ComponentArray(getdata(x)[idx...], axs...)
 end

test/runtests.jl

@@ -165,6 +165,10 @@ end
     @test A_mat isa ComponentMatrix
     @test getdata(A_vec) isa Vector
     @test getdata(A_mat) isa Matrix
+
+    @test Base.to_indices(ca, (:a, :b)) == (:a, :b)
+    @test Base.to_indices(ca, (1, 2)) == (1, 2)
+    @test Base.to_index(ca, :a) == :a
 end
 
 @testset "Set" begin