fixes count n issue (#145)

* fixes count n issue

* gets rid of xs lines in conversion to improve testing

* revert type converts, add tests

* basic logging for main verbs (#138)

* basic logging for select, mutate, and transmute

* unit testing for logs

* remove deepdiffs dependency

* adds tests for logs on the rest of the functions

* typo fix

* add mutate numbers to log

* adds join logging, fix cov x

* Fix esedge case for logging with grouped data frames.

* :newsize mode logs correct type

* add detail for row_change and col_change

* add brief docs, bump v, up news

* fixes log when grouped mutate, adds fillmissing, dropmissing log support

* fixed fxn call

* fix join log if stmnt, bump cov attempt w 2tests

* add slice log support

* change slice_min_max to not use`@filter` bc of logging msg dupes

* adds unite, sep, sep_rows

* adds logging for nests

* minor docs edits for settings

* exclude log.jl from code coverage for now

---------

Co-authored-by: Daniel Rizk <[email protected]>
Co-authored-by: Karandeep Singh <[email protected]>

* Updated NEWS.md

* Set `fail-on-error` to false for coveralls, removed excluded coverage from log.jl.

---------

Co-authored-by: Randall Boyes <[email protected]>
Co-authored-by: Karandeep Singh <[email protected]>

Author: 3 people

.github/workflows/CI.yml

@@ -38,3 +38,4 @@ jobs:
         with:
           github-token: ${{ github.token }}
           path-to-lcov: lcov.info
+          fail-on-error: false

NEWS.md

@@ -1,6 +1,7 @@
 # TidierData.jl updates
 
 ## v.0.17.0 - 2025-03-24
+- Bugfix: `@count()` can now be called multiple times. If column `n` already exists, then the new column containing the count will be `nn` (and so on).
 - Adds logging ability to track changes to data frames with `TidierData_set("log", true)`
 - Adds docs describing logging and code printing
 

src/compound_verbs.jl

@@ -55,6 +55,13 @@ macro count(df, exprs...)
   exprs = parse_blocks(exprs...)
   col_names, wt, sort = parse_count_args(exprs...)
 
+  local candidate = "n"
+  while any(x -> (isa(x, Symbol) && x == Symbol(candidate)) ||
+                 (isa(x, Expr) && x == :( $(Symbol(candidate)) )), col_names)
+    candidate *= "n"
+  end
+  local count_name = Symbol(candidate)
+
   col_names_quoted = QuoteNode(col_names)
   wt_quoted = QuoteNode(wt)
 
@@ -69,14 +76,14 @@ macro count(df, exprs...)
       end
       @chain _ begin
         if isnothing($wt_quoted)
-          @summarize(_, n = n())
+          @summarize(_, $(count_name) = n())
         else
-          @summarize(_, n = sum(skipmissing($wt)))
+          @summarize(_, $(count_name) = sum(skipmissing($wt)))
         end
       end
       @chain _ begin
         if $sort == true
-          @arrange(_, desc(n))
+          @arrange(_, desc($(count_name)))
         else
           _
         end

src/docstrings.jl

@@ -2037,7 +2037,18 @@ julia> @chain df begin
    1 │ b           15
    2 │ missing      8
    3 │ c            7
-   4 │ a            6       
+   4 │ a            6
+
+julia> @chain df begin
+         @count(a)
+         @count(n)
+       end 
+2×2 DataFrame
+ Row │ n      nn    
+     │ Int64  Int64 
+─────┼──────────────
+   1 │     3      2
+   2 │     1      2      
 ```
 """
 
@@ -2246,6 +2257,9 @@ julia> as_float("1.5")
 
 julia> as_float(missing)
 missing
+
+julia> as_float("aa")
+missing
 ```
 """
 
@@ -2276,6 +2290,9 @@ julia> as_integer("2.5")
 
 julia> as_integer(missing)
 missing
+
+julia> as_integer("letters")
+missing
 ```
 """
 

src/log.jl

@@ -1,5 +1,3 @@
-# COV_EXCL_START
-
 function generate_log(df_copy, df_output, name, modes)
     message = ""
     for mode in modes
@@ -208,6 +206,4 @@ function log_separate_changes(df_before::DataFrame, df_after::DataFrame, into)
         end
     end
     return msg
-end
-
-# COV_EXCL_STOP
+end