fixup! disallow DataFrames in obsp/varp, obsmap/varmap, layers

Author: ilia-kats

src/alignedmapping.jl

@@ -1,25 +1,17 @@
 abstract type AbstractAlignedMapping{T <: Tuple, K, V} <: AbstractDict{K, V} end
 
-struct AlignedMapping{T <: Tuple, K, R, D} <: AbstractAlignedMapping{
-    T,
-    K,
-    Union{AbstractArray{<:Number}, AbstractArray{Union{Missing, T}} where T <: Number, D == true ? DataFrame : Union{}},
-}
+struct AlignedMapping{T <: Tuple, K, R, D, V} <: AbstractAlignedMapping{T, K, V}
     ref::R # any type as long as it supports size()
-    d::Dict{
-        K,
-        Union{
-            AbstractArray{<:Number},
-            AbstractArray{Union{Missing, T}} where T <: Number,
-            D == true ? DataFrame : Union{},
-        },
-    }
+    d::Dict{K, V}
 
     function AlignedMapping{T, K, D}(r, d::AbstractDict{K}) where {T <: Tuple, K, D}
+        @assert isa(D, Bool)
         for (k, v) ∈ d
             checkdim(T, v, r, k)
         end
-        return new{T, K, typeof(r), D}(r, d)
+
+        V = Union{AbstractArray{<:Number}, AbstractArray{Union{Missing, T}} where T <: Number, D ? DataFrame : Union{}}
+        return new{T, K, typeof(r), D, V}(r, d)
     end
 end
 
@@ -266,5 +258,5 @@ function Base.view(parentview::AlignedMappingView{T}, indices...) where {T <: Tu
     return AlignedMappingView(parent(parentview), Base.reindex(parentindices(parentview), indices))
 end
 
-const StrAlignedMapping{T <: Tuple, R, D} = AlignedMapping{T, String, R, D}
+const StrAlignedMapping{T <: Tuple, R, D, V} = AlignedMapping{T, String, R, D, V}
 const StrAlignedMappingView{T <: Tuple} = AlignedMappingView{T, String}

src/mudata.jl

@@ -553,7 +553,7 @@ function _update_attr!(mdata::MuData, attr::Symbol, axis::UInt8)
                     chunk = DataFrame(chunk, names(v))
                     ellipsis = (:) # EllipsisNotation.jl doesn't work with DataFrames
                 end
-                attrm[k] = vcat(view(v, keep_index, ellipsis), chunk)
+                attrm[k] = vcat(view(v, old_index, ellipsis), chunk)
             end
         end
 
@@ -562,7 +562,7 @@ function _update_attr!(mdata::MuData, attr::Symbol, axis::UInt8)
             topright = Fill(missing, n_kept_rows, n_new_rows, size(v)[3:end]...)
             bottomleft = Fill(missing, n_new_rows, n_kept_rows, size(v)[3:end]...)
             bottomright = Fill(missing, n_new_rows, n_new_rows, size(v)[3:end]...)
-            attrp[k] = hvcat(2, view(v, keep_index, keep_index), topright, bottomleft, bottomright)
+            attrp[k] = hvcat(2, view(v, old_index, old_index), topright, bottomleft, bottomright)
         end
     end
     return mdata