renamed and fixed handling of scalar merging

src/extractors/extractdict.jl

@@ -1,9 +1,3 @@
-add_metadata2dicts = true
-
-function add_metadata2dicts!(n::Bool)
-	global add_metadata2dicts = n
-end
-
 """
 	struct ExtractDict
 		vec::Dict{String,Any}
@@ -40,16 +34,23 @@ function (s::ExtractDict{S,V})(v::Dict; store_input=false) where {S<:Dict,V<:Dic
 	x = vcat([f(get(v,String(k),nothing), store_input=store_input) for (k,f) in s.vec]...)
 	o = [Symbol(k) => f(get(v,String(k),nothing), store_input=store_input) for (k,f) in s.other]
 	data = (; :scalars => x,o...)
-	add_metadata2dicts ? ProductNode(data, [collect(keys(s.vec))]) : ProductNode(data)
+	add_metadata2dicts() ? ProductNode(data, [collect(keys(s.vec))]) : ProductNode(data)
 end
 
-(s::ExtractDict{S,V})(v::Dict; store_input=false) where {S<:Dict,V<:Nothing} =
-	vcat([f(get(v,String(k),nothing), store_input=store_input) for (k,f) in s.vec]...)
+function (s::ExtractDict{S,V})(v::Dict; store_input=false) where {S<:Dict,V<:Nothing}
+	x = vcat([f(get(v,String(k),nothing), store_input=store_input) for (k,f) in s.vec]...)
+	if skip_single_key_dict()
+		x
+	else
+		data = (; :scalars => x)
+		add_metadata2dicts() ? ProductNode(data, [collect(keys(s.vec))]) : ProductNode(data)
+	end
+end
 
 function (s::ExtractDict{S,V})(v::Dict; store_input=false) where {S<:Nothing,V<:Dict}
 	# o = [f(get(v,k,nothing)) for (k,f) in s.other]
 	o = [Symbol(k) => f(get(v,String(k),nothing), store_input=store_input) for (k,f) in s.other]
-	if length(o) == 1 && merge_scalars()
+	if length(o) == 1 && skip_single_key_dict()
 		# return(o[1])
 		return o[1].second
 	else

src/switches.jl

@@ -20,6 +20,11 @@ const _max_len = Ref(10_000)
 updatemaxlen!(n::Int) = _max_len[] = n
 max_len() = _max_len[]
 
-_merge_scalars = Ref(true)
-merge_scalars!(v::Bool) = _merge_scalars[] = v
-merge_scalars() = _merge_scalars[]
+_skip_single_key_dict = Ref(true)
+skip_single_key_dict!(v::Bool) = _skip_single_key_dict[] = v
+skip_single_key_dict() = _skip_single_key_dict[]
+
+_add_metadata2dicts = Ref(true)
+
+add_metadata2dicts!(n::Bool) = _add_metadata2dicts[] = n
+add_metadata2dicts() = _add_metadata2dicts[]