Refactor getDependency to return *all* necessary dependencies

R/htmlwidgets.R

@@ -121,23 +121,7 @@ widget_dependencies.htmlwidget <- function(x){
   jsfile = attr(x, "jsfile", exact = TRUE) %||% sprintf('%s.js', lib)
   config = attr(x, "config", exact = TRUE) %||% sprintf('%s.yaml', lib)
   package = attr(x, "package", exact = TRUE) %||% lib
-  widgetDep <- getDependency(config, package)
-
-  # TODO: The binding JS file should really be in its own directory to prevent
-  # htmltools from picking up the entire package
-  bindingDep <- htmlDependency(paste0(lib, "-binding"), packageVersion(package),
-    system.file(package = package),
-    script = jsfile
-  )
-
-  c(
-    list(htmlDependency("htmlwidgets", packageVersion("htmlwidgets"),
-      src = system.file("www", package="htmlwidgets"),
-      script = "htmlwidgets.js"
-    )),
-    widgetDep,
-    list(bindingDep)
-  )
+  getDependency(package, lib, config, jsfile)
 }
 
 # Generates a <script type="application/json"> tag with the JSON-encoded data,

R/utils.R

@@ -1,12 +1,28 @@
 #' @export
-getDependency <- function(file, package){
+getDependency <- function(package, lib, config, jsfile){
   config = yaml::yaml.load_file(
-    system.file(file, package = package)
+    system.file(config, package = package)
   )
-  lapply(config$dependencies, function(l){
+  widgetDep <- lapply(config$dependencies, function(l){
     l$src = system.file(l$src, package = package)
     do.call(htmlDependency, l)
   })
+
+  # TODO: The binding JS file should really be in its own directory to prevent
+  # htmltools from picking up the entire package
+  bindingDep <- htmlDependency(paste0(lib, "-binding"), packageVersion(package),
+    system.file(package = package),
+    script = jsfile
+  )
+
+  c(
+    list(htmlDependency("htmlwidgets", packageVersion("htmlwidgets"),
+      src = system.file("www", package="htmlwidgets"),
+      script = "htmlwidgets.js"
+    )),
+    widgetDep,
+    list(bindingDep)
+  )
 }
 
 `%||%` <- function(x, y){