fix itr in Properties

Author: rafaqz

src/optics.jl

@@ -271,11 +271,19 @@ function mapproperties(f, obj::O, handler=Construct(), itr=nothing) where O
     if isempty(pnames)
         return obj
     else
-        new_props = map(pnames) do p
-            f(getproperty(obj, p))
+        # TODO: this is too slow
+        new_props, itr = reduce(pnames; init=((), itr)) do (vals, itr), p
+            prop = getproperty(obj, p)
+            if itr isa Nothing
+                val = f(prop)
+                (vals..., val), itr
+            else
+                val, itr = f(prop, itr)
+                (vals..., val), itr
+            end
         end
         ctr = _constructor(handler, O)
-        return ctr(new_props...)
+        return _maybeitr(ctr(new_props...), itr)
     end
 end
 

test/test_queries.jl

@@ -5,7 +5,7 @@ vals = (1.0, 2.0, 3.0, 4.0)
 
 # Fields is the default
 lens = Query(; select=x -> x isa Float64, descend=x -> x isa NamedTuple)
-slowlens = Query(x -> x isa Float64, x -> x isa Tuple, Accessors.Properties())
+slowlens = Query(x -> x isa Float64, x -> x isa NamedTuple, Accessors.Properties())
 
 @code_typed lens(obj)
 @code_typed slowlens(obj)
@@ -16,13 +16,15 @@ slowlens = Query(x -> x isa Float64, x -> x isa Tuple, Accessors.Properties())
 println("get")
 @btime $lens($obj)
 @btime $slowlens($obj)
-@test lens(obj) == (17.0, 6.0)
+@test lens(obj) == slowlens(obj) == (17.0, 6.0)
 
 println("set")
 # Need a wrapper so we don't have to pass in the starting iterator
 @btime Accessors.set($obj, $lens, $vals)
-# @btime Accessors.set($obj, $slowlens, $vals)
-@test Accessors.set(obj, lens, vals) == (7, (a=1.0, b=2.0f0), ("3", 4, 5.0), (x=2.0,), )
+@btime Accessors.set($obj, $slowlens, $vals)
+@test Accessors.set(obj, lens, vals) == 
+    Accessors.set(obj, lens, vals) == 
+    (7, (a=1.0, b=2.0f0), ("3", 4, 5.0), (x=2.0,), )
 
 # using ProfileView
 # @profview for i in 1:1000000 Accessors.set(obj, lens, vals) end