diff --git a/.Rbuildignore b/.Rbuildignore index 7653e76..0c99412 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -14,3 +14,4 @@ ^\.github$ ^CRAN-SUBMISSION$ ^LICENSE\.md$ +^ignored$ diff --git a/.gitignore b/.gitignore index f523957..d1e6293 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ doc inst/doc Meta +ignored diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 02658f9..da31007 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ Version: 0.2.0 -Date: 2023-06-04 23:33:51 UTC -SHA: 59aeabbecd4af017d2833e1bbeb2215e70002681 +Date: 2023-06-05 06:55:57 UTC +SHA: e86a0e0d487cd7e3ad4b40f88435e1756b0b6bee diff --git a/DESCRIPTION b/DESCRIPTION index de60bd2..d41d8f1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -8,7 +8,7 @@ Authors@R: email = "antoine.fabri@gmail.com") Description: Visualize as flow diagrams the logic of functions, expressions or scripts in a static way or when running a call, visualize the dependencies between - functions or between modules in a shiny app, and more.. + functions or between modules in a shiny app, and more. License: MIT + file LICENSE URL: https://github.com/moodymudskipper/flow, https://moodymudskipper.github.io/flow/ BugReports: https://github.com/moodymudskipper/flow/issues diff --git a/R/05_flow_debug.R b/R/05_flow_debug.R index 99b298e..933338a 100644 --- a/R/05_flow_debug.R +++ b/R/05_flow_debug.R @@ -59,7 +59,8 @@ flow_undebug <- function(f){ #' @param ... ... #' @keywords internal #' @export +#' @return Fails with deprecation error flow_debugonce <- function(...) { - stop("`flow_debugonce()` is deprecated, use `flow_debug()`") + stop("`flow_debugonce()` is defunct, use `flow_debug()`") } diff --git a/R/09_flow_view_deps.R b/R/09_flow_view_deps.R index 0910ac9..c14aea6 100644 --- a/R/09_flow_view_deps.R +++ b/R/09_flow_view_deps.R @@ -266,11 +266,11 @@ flow_view_deps_df <- function(target_fun_name, target_fun, trim, promote, demote } deps <- function(pkg) { - ip <- installed.packages() - setdiff(trimws(union( - strsplit(gsub("\\(.*?\\)", "", ip[pkg, "Imports"]), "\\s?,\\s?")[[1]], - strsplit(gsub("\\(.*?\\)", "", ip[pkg, "Depends"]), "\\s?,\\s?")[[1]] - )), c("R", NA)) + desc <- read.dcf(system.file("DESCRIPTION", package = pkg)) + desc <- desc[,intersect(c("Imports", "Depends"), colnames(desc))] + setdiff(trimws(unique(unlist( + strsplit(gsub("\\(.*?\\)", "", desc), "\\s?,\\s?") + ))), c("R", NA)) } get_ns_obj_df <- function(ns_nm, lines) { diff --git a/R/11_flow_view_shiny.R b/R/11_flow_view_shiny.R index b9fc879..0d5c9fe 100644 --- a/R/11_flow_view_shiny.R +++ b/R/11_flow_view_shiny.R @@ -16,6 +16,7 @@ #' @param pattern A regular expression used to detect ui and server functions #' @inheritParams flow_view_deps #' @export +#' @return A flow diagram object. #' @examples #' if (requireNamespace("esquisse", quietly = TRUE)) { #' flow_view_shiny(esquisse::esquisser, show_imports = "none") diff --git a/cran-comments.md b/cran-comments.md index fd7642a..5301eb1 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +1,29 @@ ## Comments The package was archive due to the pkgdown html thing last year. This is fixed, core functionalities are the same, some feature were added. + +# Answering comments from Benjamin Altmann 2023-06-06 + +> A CRAN package should not be larger than 5 MB. Please reduce the size. + +Size was reduced, tar.gz is 3.6 Mb big + +> Please omit one full stop at the end of your DESCRIPTION: + +done + +> Missing Rd-tags: +> flow_debugonce.Rd: \value +> flow_view_shiny.Rd: \value + +Added \value section for both + +> Used ::: in documentation: +> man/flow_view_deps.Rd: +> flow_view_deps(here::i_am, hide = c(pattern = "here:::s")) + +Example was changed to use `::` rather than `:::` + +> You are using installed.packages() in your code. + +We now gather dependencies from DESCRIPTION files rather than installed.packages() diff --git a/docs/articles/customize_1.png b/docs/articles/customize_1.png index c5643dd..6b20b25 100644 Binary files a/docs/articles/customize_1.png and b/docs/articles/customize_1.png differ diff --git a/docs/articles/customize_10.png b/docs/articles/customize_10.png index 9549025..bfa2758 100644 Binary files a/docs/articles/customize_10.png and b/docs/articles/customize_10.png differ diff --git a/docs/articles/customize_2.png b/docs/articles/customize_2.png index 9f3e9c8..f0b2fd1 100644 Binary files a/docs/articles/customize_2.png and b/docs/articles/customize_2.png differ diff --git a/docs/articles/customize_3.png b/docs/articles/customize_3.png index cbc3f27..0a7d48b 100644 Binary files a/docs/articles/customize_3.png and b/docs/articles/customize_3.png differ diff --git a/docs/articles/customize_4.png b/docs/articles/customize_4.png index 0a2ddc2..b89ca42 100644 Binary files a/docs/articles/customize_4.png and b/docs/articles/customize_4.png differ diff --git a/docs/articles/customize_5.png b/docs/articles/customize_5.png index b9a5961..f4ba137 100644 Binary files a/docs/articles/customize_5.png and b/docs/articles/customize_5.png differ diff --git a/docs/articles/customize_6.png b/docs/articles/customize_6.png index b37fefa..a8025e5 100644 Binary files a/docs/articles/customize_6.png and b/docs/articles/customize_6.png differ diff --git a/docs/articles/customize_7.png b/docs/articles/customize_7.png index 6daee7a..0a21404 100644 Binary files a/docs/articles/customize_7.png and b/docs/articles/customize_7.png differ diff --git a/docs/articles/customize_8.png b/docs/articles/customize_8.png index e6054a5..6a4c659 100644 Binary files a/docs/articles/customize_8.png and b/docs/articles/customize_8.png differ diff --git a/docs/articles/customize_9.png b/docs/articles/customize_9.png index 235d46c..4c464cc 100644 Binary files a/docs/articles/customize_9.png and b/docs/articles/customize_9.png differ diff --git a/docs/articles/experimental-functions.html b/docs/articles/experimental-functions.html index 7d98f48..7667cf3 100644 --- a/docs/articles/experimental-functions.html +++ b/docs/articles/experimental-functions.html @@ -146,7 +146,7 @@

#> length <- nchar(vars) #> flat_map_int(match, ends_with_impl, vars, length) #> } -#> <bytecode: 0x107dd73c0> +#> <bytecode: 0x1365e50a0> #> <environment: namespace:tidyselect> 
 flow_view_vars(tidyselect::ends_with)
diff --git a/docs/articles/flow_compare_runs.png b/docs/articles/flow_compare_runs.png index e919575..dc124f1 100644 Binary files a/docs/articles/flow_compare_runs.png and b/docs/articles/flow_compare_runs.png differ diff --git a/docs/articles/flow_debugonce.png b/docs/articles/flow_debugonce.png index b05a5c1..e22a734 100644 Binary files a/docs/articles/flow_debugonce.png and b/docs/articles/flow_debugonce.png differ diff --git a/docs/articles/flow_run_1.png b/docs/articles/flow_run_1.png index b05a5c1..e22a734 100644 Binary files a/docs/articles/flow_run_1.png and b/docs/articles/flow_run_1.png differ diff --git a/docs/articles/flow_run_2.png b/docs/articles/flow_run_2.png index 60c00d6..dfd2ff1 100644 Binary files a/docs/articles/flow_run_2.png and b/docs/articles/flow_run_2.png differ diff --git a/docs/articles/flow_run_3.png b/docs/articles/flow_run_3.png index b61d8a0..2ff9c98 100644 Binary files a/docs/articles/flow_run_3.png and b/docs/articles/flow_run_3.png differ diff --git a/docs/articles/flow_view_1.png b/docs/articles/flow_view_1.png index 431bc72..fc1b10c 100644 Binary files a/docs/articles/flow_view_1.png and b/docs/articles/flow_view_1.png differ diff --git a/docs/articles/flow_view_2.png b/docs/articles/flow_view_2.png index 431bc72..7ae29a8 100644 Binary files a/docs/articles/flow_view_2.png and b/docs/articles/flow_view_2.png differ diff --git a/docs/articles/flow_view_3.png b/docs/articles/flow_view_3.png index fb94e6c..b00ea72 100644 Binary files a/docs/articles/flow_view_3.png and b/docs/articles/flow_view_3.png differ diff --git a/docs/articles/flow_view_4.png b/docs/articles/flow_view_4.png index 2f86729..c0f3607 100644 Binary files a/docs/articles/flow_view_4.png and b/docs/articles/flow_view_4.png differ diff --git a/docs/articles/flow_view_deps_1.png b/docs/articles/flow_view_deps_1.png index a1c2742..51f5558 100644 Binary files a/docs/articles/flow_view_deps_1.png and b/docs/articles/flow_view_deps_1.png differ diff --git a/docs/articles/flow_view_deps_2.png b/docs/articles/flow_view_deps_2.png index 96a8984..8487919 100644 Binary files a/docs/articles/flow_view_deps_2.png and b/docs/articles/flow_view_deps_2.png differ diff --git a/docs/articles/flow_view_deps_3.png b/docs/articles/flow_view_deps_3.png index 3cc6b32..d4a24f8 100644 Binary files a/docs/articles/flow_view_deps_3.png and b/docs/articles/flow_view_deps_3.png differ diff --git a/docs/articles/flow_view_deps_4.png b/docs/articles/flow_view_deps_4.png index a1c2742..0830ed1 100644 Binary files a/docs/articles/flow_view_deps_4.png and b/docs/articles/flow_view_deps_4.png differ diff --git a/docs/articles/flow_view_deps_5.png b/docs/articles/flow_view_deps_5.png index ed67a10..fbf13c2 100644 Binary files a/docs/articles/flow_view_deps_5.png and b/docs/articles/flow_view_deps_5.png differ diff --git a/docs/articles/flow_view_deps_6.png b/docs/articles/flow_view_deps_6.png index 98cefb7..c5e30cc 100644 Binary files a/docs/articles/flow_view_deps_6.png and b/docs/articles/flow_view_deps_6.png differ diff --git a/docs/articles/flow_view_deps_7.png b/docs/articles/flow_view_deps_7.png index 51b814f..89f722d 100644 Binary files a/docs/articles/flow_view_deps_7.png and b/docs/articles/flow_view_deps_7.png differ diff --git a/docs/articles/flow_view_shiny.png b/docs/articles/flow_view_shiny.png index caf8366..ec4fda2 100644 Binary files a/docs/articles/flow_view_shiny.png and b/docs/articles/flow_view_shiny.png differ diff --git a/docs/articles/flow_view_uses.png b/docs/articles/flow_view_uses.png index 207449a..d8af2bd 100644 Binary files a/docs/articles/flow_view_uses.png and b/docs/articles/flow_view_uses.png differ diff --git a/docs/articles/flow_view_vars_1.png b/docs/articles/flow_view_vars_1.png index 7f55a20..e648c43 100644 Binary files a/docs/articles/flow_view_vars_1.png and b/docs/articles/flow_view_vars_1.png differ diff --git a/docs/articles/flow_view_vars_2.png b/docs/articles/flow_view_vars_2.png index 5c4434f..2ea5f56 100644 Binary files a/docs/articles/flow_view_vars_2.png and b/docs/articles/flow_view_vars_2.png differ diff --git a/docs/articles/nested_1.png b/docs/articles/nested_1.png index fc261b3..8e17fe7 100644 Binary files a/docs/articles/nested_1.png and b/docs/articles/nested_1.png differ diff --git a/docs/articles/nested_2.png b/docs/articles/nested_2.png index 334672c..bda9976 100644 Binary files a/docs/articles/nested_2.png and b/docs/articles/nested_2.png differ diff --git a/docs/articles/nested_3.png b/docs/articles/nested_3.png index dc6c738..5c800b8 100644 Binary files a/docs/articles/nested_3.png and b/docs/articles/nested_3.png differ diff --git a/docs/articles/plantuml.png b/docs/articles/plantuml.png index 5a002ef..6ffb348 100644 Binary files a/docs/articles/plantuml.png and b/docs/articles/plantuml.png differ diff --git a/docs/index.html b/docs/index.html index 120784b..78cc322 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,7 +20,7 @@ + functions or between modules in a shiny app, and more."> flow: View and Browse Code Using Flow Diagrams — flow-package • flow @@ -82,7 +82,7 @@

flow: View and Browse Code Using Flow Diagrams

-

Visualize as flow diagrams the logic of functions, expressions or scripts in a static way or when running a call, visualize the dependencies between functions or between modules in a shiny app, and more..

+

Visualize as flow diagrams the logic of functions, expressions or scripts in a static way or when running a call, visualize the dependencies between functions or between modules in a shiny app, and more.

diff --git a/docs/reference/flow_debugonce.html b/docs/reference/flow_debugonce.html index d3da33f..65d4be4 100644 --- a/docs/reference/flow_debugonce.html +++ b/docs/reference/flow_debugonce.html @@ -93,6 +93,12 @@

Arguments

...

+
+

Value

+ + +

Fails with deprecation error

+
+
+

Value

+ + +

A flow diagram object.

+

Details

It is wrapper around flow_view_deps() which demotes every object that is not diff --git a/man/flow-package.Rd b/man/flow-package.Rd index 82ec855..b42bef3 100644 --- a/man/flow-package.Rd +++ b/man/flow-package.Rd @@ -8,7 +8,7 @@ \description{ \if{html}{\figure{logo.png}{options: style='float: right' alt='logo' width='120'}} -Visualize as flow diagrams the logic of functions, expressions or scripts in a static way or when running a call, visualize the dependencies between functions or between modules in a shiny app, and more.. +Visualize as flow diagrams the logic of functions, expressions or scripts in a static way or when running a call, visualize the dependencies between functions or between modules in a shiny app, and more. } \seealso{ Useful links: diff --git a/man/flow_debugonce.Rd b/man/flow_debugonce.Rd index ed2a933..0dc5c31 100644 --- a/man/flow_debugonce.Rd +++ b/man/flow_debugonce.Rd @@ -9,6 +9,9 @@ flow_debugonce(...) \arguments{ \item{...}{...} } +\value{ +Fails with deprecation error +} \description{ Deprecated } diff --git a/man/flow_view_shiny.Rd b/man/flow_view_shiny.Rd index 6f9bb49..ec65e73 100644 --- a/man/flow_view_shiny.Rd +++ b/man/flow_view_shiny.Rd @@ -41,6 +41,9 @@ if a regular path is used the format will be guessed from the extension.} \item{pattern}{A regular expression used to detect ui and server functions} } +\value{ +A flow diagram object. +} \description{ \ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#experimental}{\figure{lifecycle-experimental.svg}{options: alt='[Experimental]'}}}{\strong{[Experimental]}} This function displays a shiny app's module structure, assuming it is built diff --git a/vignettes/customize_1.png b/vignettes/customize_1.png index c5643dd..6b20b25 100644 Binary files a/vignettes/customize_1.png and b/vignettes/customize_1.png differ diff --git a/vignettes/customize_10.png b/vignettes/customize_10.png index 9549025..bfa2758 100644 Binary files a/vignettes/customize_10.png and b/vignettes/customize_10.png differ diff --git a/vignettes/customize_2.png b/vignettes/customize_2.png index 9f3e9c8..f0b2fd1 100644 Binary files a/vignettes/customize_2.png and b/vignettes/customize_2.png differ diff --git a/vignettes/customize_3.png b/vignettes/customize_3.png index cbc3f27..0a7d48b 100644 Binary files a/vignettes/customize_3.png and b/vignettes/customize_3.png differ diff --git a/vignettes/customize_4.png b/vignettes/customize_4.png index 0a2ddc2..b89ca42 100644 Binary files a/vignettes/customize_4.png and b/vignettes/customize_4.png differ diff --git a/vignettes/customize_5.png b/vignettes/customize_5.png index b9a5961..f4ba137 100644 Binary files a/vignettes/customize_5.png and b/vignettes/customize_5.png differ diff --git a/vignettes/customize_6.png b/vignettes/customize_6.png index b37fefa..a8025e5 100644 Binary files a/vignettes/customize_6.png and b/vignettes/customize_6.png differ diff --git a/vignettes/customize_7.png b/vignettes/customize_7.png index 6daee7a..0a21404 100644 Binary files a/vignettes/customize_7.png and b/vignettes/customize_7.png differ diff --git a/vignettes/customize_8.png b/vignettes/customize_8.png index e6054a5..6a4c659 100644 Binary files a/vignettes/customize_8.png and b/vignettes/customize_8.png differ diff --git a/vignettes/customize_9.png b/vignettes/customize_9.png index 235d46c..4c464cc 100644 Binary files a/vignettes/customize_9.png and b/vignettes/customize_9.png differ diff --git a/vignettes/flow_compare_runs.png b/vignettes/flow_compare_runs.png index e919575..dc124f1 100644 Binary files a/vignettes/flow_compare_runs.png and b/vignettes/flow_compare_runs.png differ diff --git a/vignettes/flow_debugonce.png b/vignettes/flow_debugonce.png index b05a5c1..e22a734 100644 Binary files a/vignettes/flow_debugonce.png and b/vignettes/flow_debugonce.png differ diff --git a/vignettes/flow_run_1.png b/vignettes/flow_run_1.png index b05a5c1..e22a734 100644 Binary files a/vignettes/flow_run_1.png and b/vignettes/flow_run_1.png differ diff --git a/vignettes/flow_run_2.png b/vignettes/flow_run_2.png index 60c00d6..dfd2ff1 100644 Binary files a/vignettes/flow_run_2.png and b/vignettes/flow_run_2.png differ diff --git a/vignettes/flow_run_3.png b/vignettes/flow_run_3.png index b61d8a0..2ff9c98 100644 Binary files a/vignettes/flow_run_3.png and b/vignettes/flow_run_3.png differ diff --git a/vignettes/flow_view_1.png b/vignettes/flow_view_1.png index 431bc72..fc1b10c 100644 Binary files a/vignettes/flow_view_1.png and b/vignettes/flow_view_1.png differ diff --git a/vignettes/flow_view_2.png b/vignettes/flow_view_2.png index 431bc72..7ae29a8 100644 Binary files a/vignettes/flow_view_2.png and b/vignettes/flow_view_2.png differ diff --git a/vignettes/flow_view_3.png b/vignettes/flow_view_3.png index fb94e6c..b00ea72 100644 Binary files a/vignettes/flow_view_3.png and b/vignettes/flow_view_3.png differ diff --git a/vignettes/flow_view_4.png b/vignettes/flow_view_4.png index 2f86729..c0f3607 100644 Binary files a/vignettes/flow_view_4.png and b/vignettes/flow_view_4.png differ diff --git a/vignettes/flow_view_deps_1.png b/vignettes/flow_view_deps_1.png index a1c2742..51f5558 100644 Binary files a/vignettes/flow_view_deps_1.png and b/vignettes/flow_view_deps_1.png differ diff --git a/vignettes/flow_view_deps_2.png b/vignettes/flow_view_deps_2.png index 96a8984..8487919 100644 Binary files a/vignettes/flow_view_deps_2.png and b/vignettes/flow_view_deps_2.png differ diff --git a/vignettes/flow_view_deps_3.png b/vignettes/flow_view_deps_3.png index 3cc6b32..d4a24f8 100644 Binary files a/vignettes/flow_view_deps_3.png and b/vignettes/flow_view_deps_3.png differ diff --git a/vignettes/flow_view_deps_4.png b/vignettes/flow_view_deps_4.png index a1c2742..0830ed1 100644 Binary files a/vignettes/flow_view_deps_4.png and b/vignettes/flow_view_deps_4.png differ diff --git a/vignettes/flow_view_deps_5.png b/vignettes/flow_view_deps_5.png index ed67a10..fbf13c2 100644 Binary files a/vignettes/flow_view_deps_5.png and b/vignettes/flow_view_deps_5.png differ diff --git a/vignettes/flow_view_deps_6.png b/vignettes/flow_view_deps_6.png index 98cefb7..c5e30cc 100644 Binary files a/vignettes/flow_view_deps_6.png and b/vignettes/flow_view_deps_6.png differ diff --git a/vignettes/flow_view_deps_7.png b/vignettes/flow_view_deps_7.png index 51b814f..89f722d 100644 Binary files a/vignettes/flow_view_deps_7.png and b/vignettes/flow_view_deps_7.png differ diff --git a/vignettes/flow_view_shiny.png b/vignettes/flow_view_shiny.png index caf8366..ec4fda2 100644 Binary files a/vignettes/flow_view_shiny.png and b/vignettes/flow_view_shiny.png differ diff --git a/vignettes/flow_view_uses.png b/vignettes/flow_view_uses.png index 207449a..d8af2bd 100644 Binary files a/vignettes/flow_view_uses.png and b/vignettes/flow_view_uses.png differ diff --git a/vignettes/flow_view_vars_1.png b/vignettes/flow_view_vars_1.png index 7f55a20..e648c43 100644 Binary files a/vignettes/flow_view_vars_1.png and b/vignettes/flow_view_vars_1.png differ diff --git a/vignettes/flow_view_vars_2.png b/vignettes/flow_view_vars_2.png index 5c4434f..2ea5f56 100644 Binary files a/vignettes/flow_view_vars_2.png and b/vignettes/flow_view_vars_2.png differ diff --git a/vignettes/nested_1.png b/vignettes/nested_1.png index fc261b3..8e17fe7 100644 Binary files a/vignettes/nested_1.png and b/vignettes/nested_1.png differ diff --git a/vignettes/nested_2.png b/vignettes/nested_2.png index 334672c..bda9976 100644 Binary files a/vignettes/nested_2.png and b/vignettes/nested_2.png differ diff --git a/vignettes/nested_3.png b/vignettes/nested_3.png index dc6c738..5c800b8 100644 Binary files a/vignettes/nested_3.png and b/vignettes/nested_3.png differ diff --git a/vignettes/plantuml.png b/vignettes/plantuml.png index 5a002ef..6ffb348 100644 Binary files a/vignettes/plantuml.png and b/vignettes/plantuml.png differ