Partial revert in LazyObject.hpp

Author: gennaroprota

include/mrdocs/Dom/LazyObject.hpp

@@ -320,7 +320,7 @@ size() const
 {
     std::size_t result = 0;
     MapFnType mapFn =
-        [&result, this](std::string_view name, dom::Value const&)
+        [&result, this](std::string_view name, auto const& /* value or deferred */)
         {
             result += !overlay_.exists(name);
         };
@@ -348,7 +348,7 @@ exists(std::string_view key) const
     }
     bool result = false;
     MapFnType mapFn = 
-        [&result, key](std::string_view name, dom::Value const&)
+        [&result, key](std::string_view name, auto const& /* value or deferred */)
     {
         if (!result && name == key)
         {
@@ -379,20 +379,36 @@ get(std::string_view key) const
         return overlay_.get(key);
     }
     Value result;
-    MapFnType mapFn = [&result, key](std::string_view name, dom::Value const& value) {
-        if (result.isUndefined() && name == key)
+    IOType io(
+        [&result, key, this](std::string_view name, auto const& value)
         {
-            result = value;
-        }
-    };
-    DeferFnType deferFn = [&result, key](std::string_view name, 
-                                          std::function<dom::Value()> const& deferred) {
-        if (result.isUndefined() && name == key)
+            if (result.isUndefined() && name == key)
+            {
+                if constexpr (HasValueFromWithContext<std::remove_cvref_t<decltype(value)>, Context>)
+                {
+                    ValueFrom(value, context_, result);
+                }
+                else
+                {
+                    ValueFrom(value, result);
+                }
+            }
+        },
+        [&result, key, this](std::string_view name, auto const& deferred)
         {
-            result = deferred();
-        }
-    };
-    IOType io(mapFn, deferFn, context_);
+            if (result.isUndefined() && name == key)
+            {
+                if constexpr (HasValueFromWithContext<std::remove_cvref_t<decltype(deferred())>, Context>)
+                {
+                    ValueFrom(deferred(), context_, result);
+                }
+                else
+                {
+                    ValueFrom(deferred(), result);
+                }
+            }
+        },
+        context_);
     if constexpr (HasLazyObjectMapWithContext<T, Context>)
     {
         tag_invoke(LazyObjectMapTag{}, io, *underlying_, context_);