Fix array conversion for static arrays

Author: MilesCranmer

src/arrays.jl

@@ -70,15 +70,15 @@ function Base.convert(::Type{QA}, A::QA) where {QA<:QuantityArray}
     return A
 end
 function Base.convert(::Type{QA1}, A::QA2) where {QA1<:QuantityArray,QA2<:QuantityArray}
-    Q = quantity_type(QA1)
     V = array_type(QA1)
-    N = ndims(QA1)
-
-    raw_array = Base.Fix1(convert, Q).(A)
-    output = QuantityArray(convert(constructorof(V){Q,N}, raw_array))
-    # TODO: This will mess with static arrays
+    D = dim_type(QA1)
+    Q = quantity_type(QA1)
 
-    return output::QA1
+    return QuantityArray(
+        convert(V, ustrip(A)),
+        convert(D, dimension(A)),
+        Q,
+    )::QA1
 end
 
 @inline ustrip(A::QuantityArray) = A.value

test/unittests.jl

@@ -1032,4 +1032,15 @@ end
         # TODO: Currently this converts to a `Vector` of `GenericQuantity`
         @test_skip x .* z isa QuantityArray{Float32,1,<:Dimensions,<:GenericQuantity{Float32}}
     end
+
+    @testset "Array conversion" begin
+        x = SArray{Tuple{3}}(randn(3))
+        y = SArray{Tuple{3}}(randn(Float32, 3))
+        qx = QuantityArray(x, Dimensions(Rational{Int}, length=1))
+        qy = QuantityArray(y; length=1)
+
+        @test typeof(convert(typeof(qx), qy)) == typeof(qx)
+        @test convert(typeof(qx), qy)[1] isa Quantity{Float64}
+        @test convert(typeof(qx), qy)[1] == convert(Quantity{Float64}, qy[1])
+    end
 end