Fix some issues

Author: junyuan-chen

src/DiffinDiffsBase.jl

@@ -1,12 +1,12 @@
 module DiffinDiffsBase
 
-using Combinatorics: combinations
 using CSV: File
+using Combinatorics: combinations
 using MacroTools: @capture, isexpr, postwalk
 using Reexport
+using SplitApplyCombine: groupfind, groupview
 @reexport using StatsModels
 using StatsModels: TupleTerm
-using SplitApplyCombine: groupfind, groupview
 using Tables: istable, getcolumn
 
 import Base: ==, show, union

src/StatsProcedures.jl

@@ -331,15 +331,18 @@ _procedure(::StatsSpec{A,T}) where {A,T} = T
 
 function (sp::StatsSpec{A,T})(;
         verbose::Bool=false, keep=nothing, keepall::Bool=false) where {A,T}
-    args = deepcopy(sp.args)
-    args = verbose ? merge(args, (verbose=true,)) : args
+    args = verbose ? merge(sp.args, (verbose=true,)) : sp.args
     ntall = foldl(|>, T(), init=args)
     ntall = _result(T, ntall)
     if keepall
         return ntall
-    elseif !isempty(ntall)
+    else
         if keep === nothing
-            return haskey(ntall, :result) ? ntall.result : ntall[end]
+            if isempty(ntall)
+                return nothing
+            else
+                return haskey(ntall, :result) ? ntall.result : ntall[end]
+            end
         else
             # Cannot iterate Symbol
             if keep isa Symbol
@@ -348,11 +351,10 @@ function (sp::StatsSpec{A,T})(;
                 eltype(keep)==Symbol ||
                     throw(ArgumentError("expect Symbol or collections of Symbols for the value of option `keep`"))
             end
-            !in(:result, keep) && haskey(ntall, :result) && (keep = (keep..., :result))
-            return NamedTuple{keep}(ntall)
+            in(:result, keep) || (keep = (keep..., :result))
+            names = ((n for n in keep if haskey(ntall, n))...,)
+            return NamedTuple{names}(ntall)
         end
-    else
-        return nothing
     end
 end
 
@@ -393,7 +395,7 @@ function proceed(sps::AbstractVector{<:StatsSpec};
     nsps == 0 && throw(ArgumentError("expect a nonempty vector"))
     traces = Vector{NamedTuple}(undef, nsps)
     for i in 1:nsps
-        traces[i] = deepcopy(sps[i].args)
+        traces[i] = sps[i].args
     end
     gids = groupfind(r->_procedure(r)(), sps)
     steps = pool((p for p in keys(gids))...)
@@ -438,7 +440,7 @@ function proceed(sps::AbstractVector{<:StatsSpec};
     if keepall
         return traces
     elseif keep===nothing
-        return [haskey(r, :result) ? r.result : r[end] for r in traces]
+        return [haskey(r, :result) ? r.result : isempty(r) ? nothing : r[end] for r in traces]
     else
         # Cannot iterate Symbol
         if keep isa Symbol

src/did.jl

@@ -116,15 +116,15 @@ The order of the arguments is irrelevant.
 - `args... kwargs...`: a list of arguments to be processed by [`parse_didargs`](@ref) and [`valid_didargs`](@ref).
 
 # Notes
-When used outside [`@specset`](@ref),
+When expanded outside [`@specset`](@ref),
 a [`StatsSpec`](@ref) is constructed and then estimated by calling this instance.
 Options for [`StatsSpec`] can be provided in a bracket `[...]`
 as the first argument after `@did` with each option separated by white space.
 For options that take a Boolean value,
 specifying the name of the option is enough for setting the value to be true.
 By default, only a result object that is a subtype of [`DIDResult`](@ref) is returned.
 
-When used inside [`@specset`](@ref),
+When expanded inside [`@specset`](@ref),
 `@did` informs [`@specset`](@ref) the methods for processing the arguments.
 Any option specified in the bracket is ignored.
 

test/StatsProcedures.jl

@@ -215,6 +215,8 @@ end
 
     s6 = StatsSpec("", NP, NamedTuple())
     @test s6() === nothing
+    @test s6(keepall=true) == NamedTuple()
+    @test s6(keep=:result) == NamedTuple()
 
     @test sprint(show, s1) == "name"
     @test sprint(show, s2) == "unnamed"
@@ -244,15 +246,15 @@ testformatter(nt::NamedTuple) = (haskey(nt, :name) ? nt.name : "", nt.p, (a=nt.a
     s5 = StatsSpec("s5", IP, (a="a", b="b"))
     s6 = StatsSpec("s6", CP, (a="a", b="b1"))
     s7 = StatsSpec("s7", CP, (a="a", b="b2"))
-    s8 = StatsSpec("s8", EP, (a="a", b="b"))
-
+    s8 = StatsSpec("s8", NP, NamedTuple())
+    s9 = StatsSpec("s9", EP, (a="a", b="b"))
+    
     @test proceed([s1]) == ["aab"]
     @test proceed([s1,s2], verbose=true) == ["aab", "aab"]
     @test proceed([s1,s3], verbose=true) == ["aab", "aab1"]
     @test proceed([s1,s4], verbose=true) == ["aab", "ab"]
     @test proceed([s1,s5], verbose=true) == ["aab", "aab"]
     @test proceed([s1,s4,s5], verbose=true) == ["aab", "ab", "aab"]
-    @test_throws ArgumentError proceed(StatsSpec[])
 
     @test proceed([s1], keep=:a) == [(a="a",result="aab")]
     @test proceed([s1], keep=[:a,:b]) == [(a="a", b="b", result="aab")]
@@ -275,7 +277,12 @@ testformatter(nt::NamedTuple) = (haskey(nt, :name) ? nt.name : "", nt.p, (a=nt.a
     @test ret[1].c === ret[2].c
     @test ret[1].result !== ret[2].result
 
-    @test_throws ErrorException proceed([s8])
+    @test proceed([s8]) == [nothing]
+    @test proceed([s8], keepall=true) == NamedTuple[NamedTuple()]
+    @test proceed([s8], keep=:result) == NamedTuple[NamedTuple()]
+
+    @test_throws ArgumentError proceed(StatsSpec[])
+    @test_throws ErrorException proceed([s9])
 end
 
 @testset "_parse!" begin
@@ -351,4 +358,12 @@ end
         StatsSpec(testformatter(testparser(RP; a=a, b="b1"))...)(;)
     end
     @test r == ["a1a1b", "a1a1b1", "a2a2b", "a2a2b1", "a3a3b", "a3a3b1"]
+
+    r = @specset RP a="a1" begin
+        StatsSpec(testformatter(testparser(; b="b"))...)(;)
+        for i in 2:3
+            StatsSpec(testformatter(testparser(; a="a"*"$i", b="b"))...)(;)
+        end
+    end
+    @test r == ["a1a1b", "a2a2b", "a3a3b"]
 end

test/testutils.jl

@@ -31,9 +31,8 @@ testresult(::AbstractTreatment, ::String) = ((result="testresult",), false)
 const TestResult = StatsStep{:TestResult, typeof(testresult)}
 namedargs(::TestResult) = (tr=nothing, str=nothing)
 
-const NotImplemented = DiffinDiffsEstimator{:NotImplemented, Tuple{}}
-
 const TestDID = DiffinDiffsEstimator{:TestDID, Tuple{TestStep,TestResult}}
+const NotImplemented = DiffinDiffsEstimator{:NotImplemented, Tuple{}}
 
 const TR = TestTreatment(:t, 0)
 const PR = TestParallel(0)