Adds {cnd}

.Rbuildignore

@@ -19,3 +19,4 @@ revdep
 ^CRAN-SUBMISSION$
 ^\.lintr$
 ^\.git$
+^air\.toml$

.Renviron

@@ -8,3 +8,4 @@ _R_CHECK_RD_EXAMPLES_T_AND_F_=TRUE
 _R_CHECK_INSTALL_DEPENDS_=TRUE
 _R_CHECK_DEPRECATED_DEFUNCT_=TRUE
 _R_CHECK_DONTTEST_EXAMPLES_=TRUE
+TESTTHAT_CPUS=4

.Rprofile

@@ -2,10 +2,6 @@ if (file.exists(".Renviron")) {
   readRenviron(".Renviron")
 }
 
-# Don't need anymore
-Sys.setenv(TESTTHAT_CPUS = 4)
-options(Ncpus = 4)
-
 # Some issue where this was failing in tests
 Sys.setenv(TESTTHAT_PARALLEL = if (getRversion() < "4") "FALSE" else "TRUE")
 

.lintr

@@ -3,5 +3,8 @@ linters: linters_with_defaults(
   )
 encoding: "UTF-8"
 exclusions: list(
-  "tests/spelling.R"
+  "tests/spelling.R",
+  "R/array.R",
+  "R/time-report.R",
+  "R/mark-cnd-conditions.R"
   )

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: mark
 Type: Package
 Title: Multipurpose Aids for R Kit
-Version: 0.8.3.9007
+Version: 0.8.3.9008
 Authors@R:
     person(given   = "Jordan Mark",
            family  = "Barbone",
@@ -20,17 +20,19 @@ BugReports: https://github.com/jmbarbone/mark/issues
 Encoding: UTF-8
 LazyData: true
 Depends:
-    R (>= 3.6)
+    R (>= 4.1.0)
 Imports:
     cli,
-    fs (>= 1.6.2),
-    fuj (>= 0.2.1),
+    cnd,
+    fs (>= 0.2.0),
+    fuj,
     magrittr (>= 2.0.1),
     rlang,
     stats (>= 3.6),
     tools (>= 3.6),
     utils (>= 3.6)
 Suggests:
+    arrow (>= 16.1.0),
     bench (>= 1.1.1),
     bib2df (>= 1.1.1),
     clipr (>= 0.8.0),
@@ -53,11 +55,15 @@ Suggests:
     waldo (>= 0.2.5),
     withr (>= 2.3.0),
     xopen,
-    yaml
+    yaml (>= 2.3.9),
+Remotes:
+    github::jmbarbone/cnd@v0.1.1.9002,
+    github::jmbarbone/fuj@v0.2.2.9010
 RoxygenNote: 7.3.3
 Roxygen: list(markdown = TRUE)
 Config/testthat/edition: 3
 Config/testthat/parallel: true
+Config/testthat/start-first: clipboard, sourcing, write, directory
 Language: en-US
 Collate: 
     'aaa.R'
@@ -81,7 +87,7 @@ Collate:
     'environments.R'
     'expand.R'
     'fact.R'
-    'fct_expand_seq.R'
+    'fct-expand-seq.R'
     'file.R'
     'fizzbuzz.R'
     'funs.R'
@@ -95,6 +101,7 @@ Collate:
     'lines-of-code.R'
     'logic.R'
     'map.R'
+    'mark-cnd-conditions.R'
     'not-available.R'
     'mark-package.R'
     'match-arg.R'
@@ -132,3 +139,4 @@ Collate:
     'utils.R'
     'within.R'
     'write.R'
+    'zzz.R'

NAMESPACE

@@ -296,7 +296,13 @@ export(write_clipboard)
 export(write_file_md5)
 export(wuffle)
 export(xnandr)
+import(cnd)
 import(fuj)
+importFrom(cnd,class_error)
+importFrom(cnd,input_error)
+importFrom(cnd,input_warning)
+importFrom(cnd,type_error)
+importFrom(cnd,value_error)
 importFrom(fuj,"%::%")
 importFrom(fuj,"%:::%")
 importFrom(fuj,"%colons%")

NEWS.md

@@ -1,5 +1,18 @@
 # mark (development version)
 
+* substantial changes to _conditions_
+  * all _conditions_ previously created with [`fuj::new_condition()`](https://jmbarbone.github.io/fuj/reference/new_condition.html) have been rewritten with [`cnd::condition()`](https://jmbarbone.github.io/cnd/reference/condition.html) [#259]
+  * all of these condition now use different class names, generated through [`cnd::condition()`](https://jmbarbone.github.io/cnd/reference/condition.html)
+  * for more information, see https://jmbarbone.github.io/cnd
+  * FIXME: ensure names: `{rd_name}_{thing}` -- and see about switching messages around: (`message = function(type, params)`)
+
+* the following arguments were deprecated and unused, and have now been removed completely:
+  * `list2df(show_NA)`
+  * `vector2df(show_NA)`
+  * `t_df(id)`
+
+* `merge_list(sort)` included to toggle name sorting in result
+
 * `make_sf()` now uses `substitute()` to provide more information inside the function body when viewing [#129](https://github.com/jmbarbone/mark/issues/129)
 * `round_to()` added to round values to a set [#142](https://github.com/jmbarbone/mark/issues/142)
 * `is_true()`, `is_false()` now works as documented [#262](https://github.com/jmbarbone/mark/issues/262)

R/aaa.R

@@ -0,0 +1,44 @@
+cnd_create_registry()
+
+# nolint next: line_length_linter.
+# https://github.com/RConsortium/S7/blob/e430c9aab137cc6301d5e06922e4d8cf2c0a8270/tests/testthat/helper.R#L73-L79
+# modified from:
+#   https://github.com/RConsortium/S7/issues/466#issuecomment-2417642612
+walrus <- function(sym, val) {
+  sym <- substitute(sym)
+  sym <- as.character(sym) # `"sym" <- val` is fine
+
+  val <- substitute(val)
+  val <- as.list(val)
+  val <- as.call(c(val[[1L]], sym, val[-1L]))
+
+  eval.parent(call("<-", sym, val))
+}
+
+# https://adv-r.hadley.nz/quasiquotation.html
+# := is like a vestigial organ: it’s recognised by R’s parser, but it doesn’t
+# have any code associated with it. It looks like an = but allows expressions on
+# either side, making it a more flexible alternative to =. It is used in
+# data.table for similar reasons.
+`:=` <- `%:=%` <- walrus
+
+
+# standard conditions -----------------------------------------------------
+
+#' @importFrom cnd input_error input_warning value_error type_error class_error
+
+internal_error := condition(
+  function(x) {
+    c(
+      x,
+      "\nThis is an internal `{mark}` error.  If you encounter this, please",
+      " report an issue at <https://github.com/jmbarbone/mark/issues>"
+    )
+  },
+  type = "error",
+  help = c(
+    "Generic error to capture internal `{mark}` errors.  If any of these are",
+    " encountered, please report an issue at",
+    " <https://github.com/jmbarbone/mark/issues>"
+  )
+)

R/append.R

@@ -20,7 +20,7 @@ append0.list <- function(x, values, pos = NULL, expand = FALSE, ...) {
     n <- unique(lengths(x))
 
     if (length(n) > 1) {
-      warning(cond_append_expand())
+      warning(append_warning())
       n <- max(n)
     }
 
@@ -64,6 +64,10 @@ append0.default <- function(x, values, pos = NULL, ...) {
 
 # conditions --------------------------------------------------------------
 
-cond_append_expand <- function() {
-  new_condition("expanding to the largest n", "append0", type = "warning")
-}
+# TODO does this need to be it's own condition?
+append_warning := condition(
+  message = "expanding to the largest n",
+  type = "warning",
+  package = "mark",
+  exports = "insert"
+)

R/apply.R

@@ -1,4 +1,4 @@
-
+# TODO these will be deprecated by fuj::vap
 
 # vaps --------------------------------------------------------------------
 
@@ -12,12 +12,12 @@
 #' Each function is designed to use specific vector types:
 #'
 #' \describe{
-#'   \item{vap_int}{integer}
-#'   \item{vap_dbl}{double}
-#'   \item{vap_chr}{character}
-#'   \item{vap_lgl}{logical}
-#'   \item{vap_cplx}{complex}
-#'   \item{vap_date}{Date}
+#'   \item{[mark::vap_int()]}{integer}
+#'   \item{[mark::vap_dbl()]}{double}
+#'   \item{[mark::vap_chr()]}{character}
+#'   \item{[mark::vap_lgl()]}{logical}
+#'   \item{[mark::vap_cplx()]}{complex}
+#'   \item{[mark::vap_date()]}{Date}
 #' }
 #'
 #' @param .x A vector of values
@@ -70,46 +70,6 @@ do_vap <- function(.x, .f, .value, ..., .nm) {
   vapply(X = .x, FUN = .f, FUN.VALUE = .value, ..., USE.NAMES = .nm)
 }
 
-# This can take multiple elements, so can be a little dangerous
-capply <- function(.x, .f, ..., .nm = FALSE) {
-  res <- do.call("c", lapply(X = .x, FUN = .f, ...))
-  if (.nm) {
-    set_names(res, names(.x) %||% res)
-  } else {
-    remove_names(res)
-  }
-}
-
-# A simplier implementation of sapply?
-slapply <- function(x, fun, ..., .simplify = TRUE, .names = TRUE) {
-  res <- lapply(x, fun, ...)
-
-  if (.simplify) {
-    res <- simplify2array(res, higher = FALSE)
-  }
-
-  names(res) <- if (.names) {
-    if (is.null(nm <- names(x))) x else nm
-  } else {
-    NULL
-  }
-
-  res
-}
-
-if (FALSE) {
-  x <- 1:10
-  y <- setNames(x, x)
-  lapply(x, sqrt)
-  lapply(y, sqrt)
-  sapply(x, sqrt)
-  sapply(y, sqrt)
-  sapply(y, sqrt, USE.NAMES = FALSE)
-  sapply(x, sqrt, USE.NAMES = TRUE)
-  sapply(y, sqrt, USE.NAMES = TRUE)
-  slapply(x, sqrt)
-  slapply(y, sqrt)
-  slapply(y, sqrt, .names = FALSE)
-
-  lapply(setNames(nm = 1:10), sqrt)
+capply <- function(x, f) {
+  do.call(base::c, lapply(x, f))
 }

R/array.R

@@ -1,3 +1,5 @@
+# nocov start
+
 #' Array extract
 #'
 #' Extract dimensions from an array
@@ -16,13 +18,20 @@
 #' array_extract(x, `2` = 2, `3` = 3)
 
 array_extract <- function(.arr, ..., default = "1") {
+  # what was even the point of this?
+  .Deprecated(
+    msg = c(
+      "`array_extract()` is deprecated.",
+      " Please use standard R array indexing instead, e.g., `arr[1, 2, 3]`."
+    )
+  )
   stopifnot(is.array(.arr))
 
   ls <- rlang::list2(...)
   nm <- wuffle(as.integer(names(ls) %||% seq_along(ls)))
 
   if (anyNA(nm)) {
-    stop(cond_arary_extract_names())
+    stop(input_error("... must be fully named by integers or have no names"))
   }
 
   ds <- dim(.arr)
@@ -52,11 +61,4 @@ array_extract <- function(.arr, ..., default = "1") {
   eval(str2expression(text), envir = parent.frame())
 }
 
-# conditions --------------------------------------------------------------
-
-cond_arary_extract_names <- function() {
-  new_condition(
-    "... must be fully named by integers or have no names",
-    "array_extract_names"
-  )
-}
+# nocov end