91 facts

.Rbuildignore

@@ -20,3 +20,5 @@ revdep
 ^\.lintr$
 ^\.git$
 ^air\.toml$
+^\.positai$
+^\.claude$

.gitignore

@@ -46,3 +46,4 @@ revdep/checks/libraries.csv
 revdep/data.sqlite
 tests/testthat/Rplots.pdf
 docs
+.positai

DESCRIPTION

@@ -24,8 +24,10 @@ Depends:
 Imports:
     cli,
     cnd,
+    facts,
     fs (>= 0.2.0),
     fuj,
+    generics,
     magrittr (>= 2.0.1),
     rlang,
     stats (>= 3.6),
@@ -48,6 +50,7 @@ Suggests:
     knitr (>= 1.30),
     nanoparquet,
     rcmdcheck (>= 1.3.3),
+    rmarkdown,
     stringi (>= 1.5.3),
     spelling (>= 2.2),
     testthat (>= 3.0.0),
@@ -57,9 +60,9 @@ Suggests:
     xopen,
     yaml (>= 2.3.9),
 Remotes:
+    github::jmbarbone/facts,
     github::jmbarbone/cnd@v0.1.1.9002,
-    github::jmbarbone/fuj@v0.2.2.9010
-RoxygenNote: 7.3.3
+    github::jmbarbone/fuj@105-defaults
 Roxygen: list(markdown = TRUE)
 Config/testthat/edition: 3
 Config/testthat/parallel: true
@@ -86,7 +89,6 @@ Collate:
     'directory.R'
     'environments.R'
     'expand.R'
-    'fact.R'
     'fct-expand-seq.R'
     'file.R'
     'fizzbuzz.R'
@@ -122,6 +124,7 @@ Collate:
     'recode.R'
     'reexports-fuj.R'
     'reexports-magrittr.R'
+    'rexports-facts.R'
     'round-by.R'
     'round.R'
     'row-bind.R'
@@ -140,3 +143,4 @@ Collate:
     'within.R'
     'write.R'
     'zzz.R'
+Config/roxygen2/version: 8.0.0

NAMESPACE

@@ -1,14 +1,8 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method("[",fact)
 S3method(append0,data.frame)
 S3method(append0,default)
 S3method(append0,list)
-S3method(as.Date,fact)
-S3method(as.character,fact)
-S3method(as.double,fact)
-S3method(as.integer,fact)
-S3method(as_ordered,default)
 S3method(assign_labels,data.frame)
 S3method(assign_labels,default)
 S3method(char2fact,character)
@@ -23,20 +17,6 @@ S3method(depth,default)
 S3method(depth,list)
 S3method(detail,data.frame)
 S3method(detail,default)
-S3method(drop_levels,data.frame)
-S3method(drop_levels,fact)
-S3method(drop_levels,factor)
-S3method(fact,Date)
-S3method(fact,POSIXt)
-S3method(fact,character)
-S3method(fact,default)
-S3method(fact,fact)
-S3method(fact,factor)
-S3method(fact,haven_labelled)
-S3method(fact,integer)
-S3method(fact,logical)
-S3method(fact,numeric)
-S3method(fact,pseudo_id)
 S3method(get_labels,data.frame)
 S3method(get_labels,default)
 S3method(is_false,default)
@@ -46,7 +26,6 @@ S3method(is_true,logical)
 S3method(normalize,data.frame)
 S3method(normalize,default)
 S3method(print,diff_time)
-S3method(print,fact)
 S3method(print,has_catch)
 S3method(print,mark_bib_df)
 S3method(print,mark_bib_entry)
@@ -74,7 +53,6 @@ S3method(to_boolean,factor)
 S3method(to_boolean,integer)
 S3method(to_boolean,logical)
 S3method(to_boolean,numeric)
-S3method(unique,fact)
 S3method(write_clipboard,data.frame)
 S3method(write_clipboard,default)
 S3method(write_clipboard,list)
@@ -103,7 +81,6 @@ export(add_file_timestamp)
 export(any_match)
 export(are_identical)
 export(array_extract)
-export(as_ordered)
 export(assign_labels)
 export(base_alpha)
 export(base_n)
@@ -130,15 +107,13 @@ export(diff_time_secs)
 export(diff_time_weeks)
 export(diff_time_wyears)
 export(diff_time_years)
-export(drop_levels)
 export(either)
 export(environments)
 export(ept)
 export(eval_named_chunk)
 export(expand_by)
 export(fact)
 export(fact2char)
-export(fact_na)
 export(fct_expand_seq)
 export(file_copy_md5)
 export(file_name)
@@ -303,6 +278,7 @@ importFrom(cnd,input_error)
 importFrom(cnd,input_warning)
 importFrom(cnd,type_error)
 importFrom(cnd,value_error)
+importFrom(facts,fact)
 importFrom(fuj,"%::%")
 importFrom(fuj,"%:::%")
 importFrom(fuj,"%colons%")

R/char2fact.R

@@ -20,10 +20,10 @@
 #' @rdname char2fact
 #' @export
 char2fact.character <- function(x, n = 5) {
-  id <- pseudo_id(x)
+  fct <- factor(x)
 
-  if (length(.uniques(id)) <= n) {
+  if (length(attr(id, "uniques")) <= n) {
     x <- fact(id)
   }
 
   x

R/counts.R

@@ -49,9 +49,10 @@ counts <- function(x, ...) {
 #' @export
 counts.default <- function(x, sort = FALSE, ...) {
   x <- pseudo_id(x)
-  u <- .uniques(x)
+  u <- attr(x, "uniques")
   out <- tabulate(x, length(u))
-  names(out) <- na_last(u)
+  nas <- is.na(u)
+  names(out) <- c(u[!nas], u[nas])
 
   if (sort) {
     return(sort_names(out, numeric = is.numeric(x)))