From 1c24ee8e166f6a407a42cb646cf01fa2b4fbaa38 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 26 Oct 2023 23:06:05 +0800
Subject: [PATCH] feat: one-step constructure (#30) (fix #25)

Co-authored-by: zzyyyl <aysyxx53@hotmail.com>
---
 include/json.hpp  | 14 +++++++++++++-
 sample/sample.cpp |  6 +++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/include/json.hpp b/include/json.hpp
index a5dff33..8cc0001 100644
--- a/include/json.hpp
+++ b/include/json.hpp
@@ -107,7 +107,19 @@ class basic_value
     template <typename... args_t>
     basic_value(value_type type, args_t&&... args);
 
-    template <typename value_t, typename _ = std::enable_if_t<!std::is_convertible_v<value_t, basic_value<string_t>>>>
+    template <typename collection_t,
+              std::enable_if_t<std::is_constructible_v<typename basic_array<string_t>::value_type,
+                                                       utils::range_value_t<collection_t>>,
+                               bool> = true>
+    basic_value(collection_t&& collection) : basic_value(basic_array<string_t>(std::forward<collection_t>(collection)))
+    {}
+    template <typename map_t, std::enable_if_t<std::is_constructible_v<typename basic_object<string_t>::value_type,
+                                                                       utils::range_value_t<map_t>>,
+                                               bool> = true>
+    basic_value(map_t&& map) : basic_value(basic_object<string_t>(std::forward<map_t>(map)))
+    {}
+
+    template <typename value_t, std::enable_if_t<!std::is_convertible_v<value_t, basic_value<string_t>>, bool> = true>
     basic_value(value_t) = delete;
 
     // I don't know if you want to convert char to string or number, so I delete these constructors.
diff --git a/sample/sample.cpp b/sample/sample.cpp
index 7e655eb..1cc89d4 100644
--- a/sample/sample.cpp
+++ b/sample/sample.cpp
@@ -227,16 +227,16 @@ bool serializing()
     root["arr"] += json::array { 6, 7 };
 
     std::vector<int> vec = { 1, 2, 3, 4, 5 };
-    root["arr from vec"] = json::array(vec);
+    root["arr from vec"] = vec;
 
     std::set<std::string> set = { "a", "bb\n\nb", "cc\t" };
-    root["arr from set"] = json::array(set);
+    root["arr from set"] = set;
 
     std::map<std::string, int> map {
         { "key1", 1 },
         { "key2", 2 },
     };
-    root["obj from map"] = json::object(map);
+    root["obj from map"] = map;
 
     std::vector<std::list<std::set<int>>> complex { { { 1, 2, 3 }, { 4, 5 } }, { { 6 }, { 7, 8 } } };
     root["complex"] = json::serialize<false>(complex);