Apply lobstr::cst pruning to deep stack traces too

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.2.0
+Version: 1.0.5.9000
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -62,10 +62,14 @@ License: GPL-3 | file LICENSE
 Depends:
     R (>= 3.0.2),
     methods
+Remotes:
+    r-lib/later,
+    rstudio/promises,
+    rstudio/httpuv
 Imports:
     utils,
     grDevices,
-    httpuv (>= 1.4.4),
+    httpuv (>= 1.3.5),
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
@@ -73,11 +77,10 @@ Imports:
     htmltools (>= 0.3.5),
     R6 (>= 2.0),
     sourcetools,
-    later (>= 0.7.2),
-    promises (>= 1.0.1),
+    later (>= 0.7.1),
+    promises (>= 0.1.0.9001),
     tools,
-    crayon,
-    rlang
+    crayon
 Suggests:
     datasets,
     Cairo (>= 1.5-5),
@@ -89,7 +92,7 @@ Suggests:
     magrittr
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
-Collate:
+Collate: 
     'app.R'
     'bookmark-state-local.R'
     'stack.R'
@@ -100,10 +103,7 @@ Collate:
     'map.R'
     'utils.R'
     'bootstrap.R'
-    'cache-context.R'
-    'cache-disk.R'
-    'cache-memory.R'
-    'cache-utils.R'
+    'cache.R'
     'diagnose.R'
     'fileupload.R'
     'graph.R'
@@ -142,7 +142,6 @@ Collate:
     'priorityqueue.R'
     'progress.R'
     'react.R'
-    'render-cached-plot.R'
     'render-plot.R'
     'render-table.R'
     'run-url.R'
@@ -159,4 +158,4 @@ Collate:
     'test-export.R'
     'timer.R'
     'update-input.R'
-RoxygenNote: 6.1.0
+RoxygenNote: 6.0.1

LICENSE

@@ -673,7 +673,7 @@ bootstrap-datepicker
    limitations under the License.
 
 
-Font Awesome (CSS files are MIT licensed; fonts have SIL Open Font License 1.1, svgs have CC BY 4.0 License)
+Font-Awesome (CSS file is MIT licensed; font has SIL Open Font License 1.1)
 ----------------------------------------------------------------------
 
 The MIT License (MIT)
@@ -795,326 +795,6 @@ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.
 
-=======================================================================
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution 4.0 International Public License ("Public License"). To the
-extent this Public License may be interpreted as a contract, You are
-granted the Licensed Rights in consideration of Your acceptance of
-these terms and conditions, and the Licensor grants You such rights in
-consideration of benefits the Licensor receives from making the
-Licensed Material available under these terms and conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  d. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  e. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  f. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  g. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  h. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  i. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  j. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  k. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-       4. If You Share Adapted Material You produce, the Adapter's
-          License You apply must not prevent recipients of the Adapted
-          Material from complying with this Public License.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material; and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
 
 selectize.js
 ----------------------------------------------------------------------

NAMESPACE

@@ -25,7 +25,6 @@ S3method(as.tags,shiny.render.function)
 S3method(format,reactiveExpr)
 S3method(format,reactiveVal)
 S3method(names,reactivevalues)
-S3method(print,key_missing)
 S3method(print,reactive)
 S3method(print,shiny.appobj)
 S3method(str,reactivevalues)
@@ -68,7 +67,6 @@ export(dateRangeInput)
 export(dblclickOpts)
 export(debounce)
 export(dialogViewer)
-export(diskCache)
 export(div)
 export(downloadButton)
 export(downloadHandler)
@@ -92,7 +90,6 @@ export(fluidRow)
 export(formatStackTrace)
 export(freezeReactiveVal)
 export(freezeReactiveValue)
-export(getCurrentOutputInfo)
 export(getDefaultReactiveDomain)
 export(getQueryString)
 export(getShinyOption)
@@ -124,7 +121,6 @@ export(insertTab)
 export(insertUI)
 export(installExprFunction)
 export(invalidateLater)
-export(is.key_missing)
 export(is.reactive)
 export(is.reactivevalues)
 export(is.shiny.appobj)
@@ -132,7 +128,6 @@ export(is.singleton)
 export(isRunning)
 export(isTruthy)
 export(isolate)
-export(key_missing)
 export(knit_print.html)
 export(knit_print.reactive)
 export(knit_print.shiny.appobj)
@@ -143,7 +138,6 @@ export(mainPanel)
 export(makeReactiveBinding)
 export(markRenderFunction)
 export(maskReactiveContext)
-export(memoryCache)
 export(modalButton)
 export(modalDialog)
 export(navbarMenu)
@@ -195,7 +189,6 @@ export(removeModal)
 export(removeNotification)
 export(removeTab)
 export(removeUI)
-export(renderCachedPlot)
 export(renderDataTable)
 export(renderImage)
 export(renderPlot)
@@ -233,7 +226,6 @@ export(showTab)
 export(sidebarLayout)
 export(sidebarPanel)
 export(singleton)
-export(sizeGrowthRatio)
 export(sliderInput)
 export(snapshotExclude)
 export(snapshotPreprocessInput)
@@ -276,13 +268,9 @@ export(updateSliderInput)
 export(updateTabsetPanel)
 export(updateTextAreaInput)
 export(updateTextInput)
-export(updateVarSelectInput)
-export(updateVarSelectizeInput)
 export(urlModal)
 export(validate)
 export(validateCssUnit)
-export(varSelectInput)
-export(varSelectizeInput)
 export(verbatimTextOutput)
 export(verticalLayout)
 export(wellPanel)

NEWS.md

@@ -1,132 +1,41 @@
-shiny 1.2.0
-===========
-
-This release features plot caching, an important new tool for improving performance and scalability. Using `renderCachedPlot` in place of `renderPlot` can greatly improve responsiveness for apps that show the same plot many times (for example, a dashboard or report where all users view the same data). Shiny gives you a fair amount of control in where the cache is stored and how cached plots are invalidated, so be sure to read [this article](http://shiny.rstudio.com/articles/plot-caching.html) to get the most out of this feature.
-
-## Full changelog
-
-### New features
-
-* Added `renderCachedPlot()`, which stores plots in a cache so that they can be served up almost instantly. ([#1997](https://github.com/rstudio/shiny/pull/1997))
-
-### Minor new features and improvements
-
-* Upgrade FontAwesome from 4.7.0 to 5.3.1 and made `icon` tags browsable [#2186](https://github.com/rstudio/shiny/issues/2186).
-
-* Address [#174](https://github.com/rstudio/shiny/issues/174): Added `datesdisabled` and `daysofweekdisabled` as new parameters to `dateInput()`. This resolves [#174](https://github.com/rstudio/shiny/issues/174) and exposes the underlying arguments of [Bootstrap Datepicker](http://bootstrap-datepicker.readthedocs.io/en/latest/options.html#datesdisabled). `datesdisabled` expects a character vector with values in `yyyy/mm/dd` format and `daysofweekdisabled` expects an integer vector with day interger ids (Sunday=0, Saturday=6). The default value for both is `NULL`, which leaves all days selectable. Thanks, @nathancday! ([#2147](https://github.com/rstudio/shiny/pull/2147))
-
-* Support for selecting variables of a data frame with the output values to be used within tidy evaluation.  Added functions: `varSelectInput`, `varSelectizeInput`, `updateVarSelectInput`, `updateVarSelectizeInput`. ([#2091](https://github.com/rstudio/shiny/pull/2091))
-
-* Addressed [#2042](https://github.com/rstudio/shiny/issues/2042): dates outside of `min`/`max` date range are now a lighter shade of grey to highlight the allowed range. ([#2087](https://github.com/rstudio/shiny/pull/2087))
-
-* Added support for plot interaction when the plot is scaled. ([#2125](https://github.com/rstudio/shiny/pull/2125))
-
-* Fixed [#1933](https://github.com/rstudio/shiny/issues/1933): extended server-side selectize to lists and optgroups. ([#2102](https://github.com/rstudio/shiny/pull/2102))
-
-* Added namespace support when freezing reactiveValue keys. [#2080](https://github.com/rstudio/shiny/pull/2080)
-
-* Upgrade selectize.js from 0.12.1 to 0.12.4 [#2028](https://github.com/rstudio/shiny/issues/2028)
-
-* Addressed [#2079](https://github.com/rstudio/shiny/issues/2079): Added `coords_img`, `coords_css`, and `img_css_ratio` fields containing x and y location information for plot brush, hover, and click events. [#2183](https://github.com/rstudio/shiny/pull/2183)
-
-### Bug fixes
-
-* Fixed [#2033](https://github.com/rstudio/shiny/issues/2033): RStudio Viewer window not closed on `shiny::stopApp()`. Thanks, @vnijs! [#2047](https://github.com/rstudio/shiny/pull/2047)
-
-* Fixed [#1935](https://github.com/rstudio/shiny/issues/1935): correctly returns plot coordinates when using outer margins. ([#2108](https://github.com/rstudio/shiny/pull/2108))
-
-* Resolved [#2019](https://github.com/rstudio/shiny/issues/2019): `updateSliderInput` now changes the slider formatting if the input type changes. ([#2099](https://github.com/rstudio/shiny/pull/2099))
-
-* Fixed [#2138](https://github.com/rstudio/shiny/issues/2138): Inputs that are part of a `renderUI` were no longer restoring correctly from bookmarked state. [#2139](https://github.com/rstudio/shiny/pull/2139)
-
-* Fixed [#2093](https://github.com/rstudio/shiny/issues/2093): Make sure bookmark scope directory does not exist before trying to create it. [#2168](https://github.com/rstudio/shiny/pull/2168)
-
-* Fixed [#2177](https://github.com/rstudio/shiny/issues/2177): The session name is now being recorded when exiting a context.  Multiple sessions can now view their respective reactlogs. [#2180](https://github.com/rstudio/shiny/pull/2180)
-
-* Fixed [#2162](https://github.com/rstudio/shiny/issues/2162): `selectInput` was sending spurious duplicate values to the server when using backspace. Thanks, @sada1993! [#2187](https://github.com/rstudio/shiny/pull/2187)
-
-* Fixed [#2142](https://github.com/rstudio/shiny/issues/2142): Dropping files on `fileInput`s stopped working on recent releases of Firefox. Thanks @dmenne for reporting! [#2203](https://github.com/rstudio/shiny/pull/2203)
-
-* Fixed [#2204](https://github.com/rstudio/shiny/issues/2204): `updateDateInput` could set the wrong date on days where DST begins. [#2211](https://github.com/rstudio/shiny/pull/2211)
-
-### Documentation Updates
-
-* Addressed [#1864](https://github.com/rstudio/shiny/issues/1864) by changing `optgroup` documentation to use `list` instead of `c`. ([#2084](https://github.com/rstudio/shiny/pull/2084))
-
-
-shiny 1.1.0
-===========
-
-This is a significant release for Shiny, with a major new feature that was nearly a year in the making: support for asynchronous operations! Until now, R's single-threaded nature meant that performing long-running calculations or tasks from Shiny would bring your app to a halt for other users of that process. This release of Shiny deeply integrates the [promises](https://rstudio.github.io/promises/) package to allow you to execute some tasks asynchronously, including as part of reactive expressions and outputs. See the [promises](https://rstudio.github.io/promises/) documentation to learn more.
+shiny 1.0.5.9000
+================
 
 ## Full changelog
 
 ### Breaking changes
 
-* `extractStackTrace` and `formatStackTrace` are deprecated and will be removed in a future version of Shiny. As far as we can tell, nobody has been using these functions, and a refactor has made them vestigial; if you need this functionality, please file an issue.
-
 ### New features
 
-* Support for asynchronous operations! Built-in render functions that expected a certain kind of object to be yielded from their `expr`, now generally can handle a promise for that kind of object. Reactive expressions and observers are now promise-aware as well. ([#1932](https://github.com/rstudio/shiny/pull/1932))
-
-* Introduced two changes to the (undocumented but widely used) JavaScript function `Shiny.onInputChange(name, value)`. First, we changed the function name to `Shiny.setInputValue` (but don't worry--the old function name will continue to work). Second, until now, all calls to `Shiny.onInputChange(inputId, value)` have been "deduplicated"; that is, anytime an input is set to the same value it already has, the set is ignored. With Shiny v1.1, you can now add an options object as the third parameter: `Shiny.setInputValue("name", value, {priority: "event"})`. When the priority option is set to `"event"`, Shiny will always send the value and trigger reactivity, whether it is a duplicate or not. This closes [#928](https://github.com/rstudio/shiny/issues/928), which was the most upvoted open issue by far! Thanks, @daattali. ([#2018](https://github.com/rstudio/shiny/pull/2018))
-
 ### Minor new features and improvements
 
-* Addressed [#1978](https://github.com/rstudio/shiny/issues/1978): `shiny:value` is now triggered when duplicate output data is received from the server. (Thanks, @andrewsali! [#1999](https://github.com/rstudio/shiny/pull/1999))
-
-* If a shiny output contains a css class of `shiny-report-size`, its container height and width are now reported in `session$clientData`. So, for an output with an id with `"myID"`, the height/width can be accessed via `session$clientData[['output_myID_height']]`/`session$clientData[['output_myID_width']]`. Addresses [#1980](https://github.com/rstudio/shiny/issues/1980). (Thanks, @cpsievert! [#1981](https://github.com/rstudio/shiny/pull/1981))
-
-* Added a new `autoclose = TRUE` parameter to `dateInput()` and `dateRangeInput()`. This closed [#1969](https://github.com/rstudio/shiny/issues/1969) which was a duplicate of much older issue, [#173](https://github.com/rstudio/shiny/issues/173). The default value is `TRUE` since that seems to be the common use case. However, this will cause existing apps with date inputs (that update to this version of Shiny) to have the datepicker be immediately closed once a date is selected. For most apps, this is actually desired behavior; if you wish to keep the datepicker open until the user clicks out of it use `autoclose = FALSE`. ([#1987](https://github.com/rstudio/shiny/pull/1987))
+* Changed script tags in reactlog ([inst/www/reactive-graph.html](https://github.com/rstudio/shiny/blob/master/inst/www/reactive-graph.html)) from HTTP to HTTPS in order to avoid mixed content blocking by most browsers. (Thanks, [@jekriske-lilly](https://github.com/jekriske-lilly)! [#1844](https://github.com/rstudio/shiny/pull/1844))
 
 * The version of Shiny is now accessible from Javascript, with `Shiny.version`. There is also a new function for comparing version strings, `Shiny.compareVersion()`. ([#1826](https://github.com/rstudio/shiny/pull/1826), [#1830](https://github.com/rstudio/shiny/pull/1830))
 
+* Addressed [#1784](https://github.com/rstudio/shiny/issues/1784): `runApp()` will avoid port 6697, which is considered unsafe by Chrome.
+
 * Addressed [#1851](https://github.com/rstudio/shiny/issues/1851): Stack traces are now smaller in some places `do.call()` is used. ([#1856](https://github.com/rstudio/shiny/pull/1856))
 
-* Stack traces have been improved, with more aggressive de-noising and support for deep stack traces (stitching together multiple stack traces that are conceptually part of the same async operation).
-
 * Addressed [#1859](https://github.com/rstudio/shiny/issues/1859): Server-side selectize is now significantly faster. (Thanks to @dselivanov [#1861](https://github.com/rstudio/shiny/pull/1861))
 
-* [#1989](https://github.com/rstudio/shiny/issues/1989): The server side of outputs can now be removed (e.g. `output$plot <- NULL`). This is not usually necessary but it does allow some objects to be garbage collected, which might matter if you are dynamically creating and destroying many outputs. (Thanks, @mmuurr! [#2011](https://github.com/rstudio/shiny/pull/2011))
-
-* Removed the (ridiculously outdated) "experimental feature" tag from the reference documentation for `renderUI`. ([#2036](https://github.com/rstudio/shiny/pull/2036))
-
-* Addressed [#1907](https://github.com/rstudio/shiny/issues/1907): the `ignoreInit` argument was first added only to `observeEvent`. Later, we also added it to `eventReactive`, but forgot to update the documentation. Now done, thanks [@flo12392](https://github.com/flo12392)! ([#2036](https://github.com/rstudio/shiny/pull/2036))
-
-### Bug fixes
-
 * Fixed [#1006](https://github.com/rstudio/shiny/issues/1006): Slider inputs sometimes showed too many digits. ([#1956](https://github.com/rstudio/shiny/pull/1956))
 
 * Fixed [#1958](https://github.com/rstudio/shiny/issues/1958): Slider inputs previously displayed commas after a decimal point. ([#1960](https://github.com/rstudio/shiny/pull/1960))
 
+
+### Bug fixes
+
 * The internal `URLdecode()` function previously was a copy of `httpuv::decodeURIComponent()`, assigned at build time; now it invokes the httpuv function at run time.
 
 * Fixed [#1840](https://github.com/rstudio/shiny/issues/1840): with the release of Shiny 1.0.5, we accidently changed the relative positioning of the icon and the title text in `navbarMenu`s and `tabPanel`s. This fix reverts this behavior back (i.e. the icon should be to the left of the text and/or the downward arrow in case of `navbarMenu`s). ([#1848](https://github.com/rstudio/shiny/pull/1848))
 
 * Fixed [#1600](https://github.com/rstudio/shiny/issues/1600): URL-encoded bookmarking did not work with sliders that had dates or date-times. ([#1961](https://github.com/rstudio/shiny/pull/1961))
 
-* Fixed [#1962](https://github.com/rstudio/shiny/issues/1962): [File dragging and dropping](https://blog.rstudio.com/2017/08/15/shiny-1-0-4/) broke in the presence of jQuery version 3.0 as introduced by the [rhandsontable](https://jrowen.github.io/rhandsontable/) [htmlwidget](https://www.htmlwidgets.org/). ([#2005](https://github.com/rstudio/shiny/pull/2005))
-
-* Improved the error handling inside the `addResourcePath()` function, to give end users more informative error messages when the `directoryPath` argument cannot be normalized. This is especially useful for `runtime: shiny_prerendered` Rmd documents, like `learnr` tutorials. ([#1968](https://github.com/rstudio/shiny/pull/1968))
-
-* Changed script tags in reactlog ([inst/www/reactive-graph.html](https://github.com/rstudio/shiny/blob/master/inst/www/reactive-graph.html)) from HTTP to HTTPS in order to avoid mixed content blocking by most browsers. (Thanks, @jekriske-lilly! [#1844](https://github.com/rstudio/shiny/pull/1844))
-
-* Addressed [#1784](https://github.com/rstudio/shiny/issues/1784): `runApp()` will avoid port 6697, which is considered unsafe by Chrome.
-
-* Fixed [#2000](https://github.com/rstudio/shiny/issues/2000): Implicit calls to `xxxOutput` not working inside modules. (Thanks, @GregorDeCillia! [#2010](https://github.com/rstudio/shiny/pull/2010))
-
-* Fixed [#2021](https://github.com/rstudio/shiny/issues/2021): Memory leak with `reactiveTimer` and `invalidateLater`. ([#2022](https://github.com/rstudio/shiny/pull/2022))
-
 ### Library updates
 
 * Updated to ion.rangeSlider 2.2.0. ([#1955](https://github.com/rstudio/shiny/pull/1955))
 
-
-## Known issues
-
-In some rare cases, interrupting an application (by pressing Ctrl-C or Esc) may result in the message `Error in execCallbacks(timeoutSecs) : c++ exception (unknown reason)`. Although this message sounds alarming, it is harmless, and will go away in a future version of the later package (more information [here](https://github.com/r-lib/later/issues/55)).
-
-
 shiny 1.0.5
 ===========
 
@@ -338,7 +247,7 @@ Now there's an official way to slow down reactive values and expressions that in
 ### Minor new features and improvements
 
 * Addressed [#1486](https://github.com/rstudio/shiny/issues/1486) by adding a new argument to `observeEvent` and `eventReactive`, called `ignoreInit` (defaults to `FALSE` for backwards compatibility). When set to `TRUE`, the action (i.e. the second argument: `handlerExpr` and `valueExpr`, respectively) will not be triggered when the observer/reactive is first created/initialized. In other words, `ignoreInit = TRUE` ensures that the `observeEvent` (or `eventReactive`) is *never* run right away. For more info, see the documentation (`?observeEvent`). ([#1494](https://github.com/rstudio/shiny/pull/1494))
-
+    
 * Added a new argument to `observeEvent` called `once`. When set to `TRUE`, it results in the observer being destroyed (stop observing) after the first time that `handlerExpr` is run (i.e. `once = TRUE` guarantees that the observer only runs, at most, once). For more info, see the documentation (`?observeEvent`). ([#1494](https://github.com/rstudio/shiny/pull/1494))
 
 * Addressed [#1358](https://github.com/rstudio/shiny/issues/1358): more informative error message when calling `runApp()` inside of an app's app.R (or inside ui.R or server.R). ([#1482](https://github.com/rstudio/shiny/pull/1482))
@@ -737,7 +646,7 @@ shiny 0.12.1
 shiny 0.12.0
 ============
 
-In addition to the changes listed below (in the *Full Changelog* section), there is an infrastructure change that could affect existing Shiny apps.
+In addition to the changes listed below (in the *Full Changelog* section), there is an infrastructure change that could affect existing Shiny apps. 
 
 ### JSON serialization
 
@@ -828,13 +737,13 @@ Shiny 0.11 switches away from the Bootstrap 2 web framework to the next version,
 ### Known issues for migration
 
 *    In Bootstrap 3, images in `<img>` tags are no longer automatically scaled to the width of their container. If you use `img()` in your UI code, or `<img>` tags in your raw HTML source, it's possible that they will be too large in the new version of Shiny. To address this you can add the `img-responsive` class:
-
+    
     ```r
     img(src = "picture.png", class = "img-responsive")
     ```
-
+    
     The R code above will generate the following HTML:
-
+    
     ```html
     <img src="picture.png" class="img-responsive">
     ```

R/bookmark-state.R

@@ -448,13 +448,7 @@ withRestoreContext <- function(ctx, expr) {
 
 # Is there a current restore context?
 hasCurrentRestoreContext <- function() {
-  if (restoreCtxStack$size() > 0)
-    return(TRUE)
-  domain <- getDefaultReactiveDomain()
-  if (!is.null(domain) && !is.null(domain$restoreContext))
-    return(TRUE)
-  
-  return(FALSE)
+  restoreCtxStack$size() > 0
 }
 
 # Call to access the current restore context. First look on the restore

R/bootstrap-layout.R

@@ -588,7 +588,7 @@ flexfill <- function(..., direction, flex, width = width, height = height) {
   }
 
   if (length(flex) > length(children)) {
-    flex <- flex[seq_along(children)]
+    flex <- flex[1:length(children)]
   }
 
   # The dimension along the main axis

R/bootstrap.R

@@ -1489,9 +1489,8 @@ downloadLink <- function(outputId, label="Download", class=NULL, ...) {
 #' \code{\link{navbarPage}}.
 #'
 #' @param name Name of icon. Icons are drawn from the
-#'   \href{https://fontawesome.com/}{Font Awesome Free} (currently icons from
-#'   the v5.3.1 set are supported with the v4 naming convention) and
-#'   \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons}
+#'   \href{http://fontawesome.io/icons/}{Font Awesome} and
+#'   \href{http://getbootstrap.com/components/#glyphicons}{Glyphicons"}
 #'   libraries. Note that the "fa-" and "glyphicon-" prefixes should not be used
 #'   in icon names (i.e. the "fa-calendar" icon should be referred to as
 #'   "calendar")
@@ -1547,15 +1546,12 @@ icon <- function(name, class = NULL, lib = "font-awesome") {
   # font-awesome needs an additional dependency (glyphicon is in bootstrap)
   if (lib == "font-awesome") {
     htmlDependencies(iconTag) <- htmlDependency(
-      "font-awesome", "5.3.1", "www/shared/fontawesome", package = "shiny",
-      stylesheet = c(
-        "css/all.min.css",
-        "css/v4-shims.min.css"
-      )
+      "font-awesome", "4.7.0", c(href="shared/font-awesome"),
+      stylesheet = "css/font-awesome.min.css"
     )
   }
 
-  htmltools::browsable(iconTag)
+  iconTag
 }
 
 # Helper funtion to extract the class from an icon

R/cache-disk.R

@@ -1,561 +0,0 @@
-#' Create a disk cache object
-#'
-#' A disk cache object is a key-value store that saves the values as files in a
-#' directory on disk. Objects can be stored and retrieved using the \code{get()}
-#' and \code{set()} methods. Objects are automatically pruned from the cache
-#' according to the parameters \code{max_size}, \code{max_age}, \code{max_n},
-#' and \code{evict}.
-#'
-#'
-#' @section Missing Keys:
-#'
-#'   The \code{missing} and \code{exec_missing} parameters controls what happens
-#'   when \code{get()} is called with a key that is not in the cache (a cache
-#'   miss). The default behavior is to return a \code{\link{key_missing}}
-#'   object. This is a \emph{sentinel value} that indicates that the key was not
-#'   present in the cache. You can test if the returned value represents a
-#'   missing key by using the \code{\link{is.key_missing}} function. You can
-#'   also have \code{get()} return a different sentinel value, like \code{NULL}.
-#'   If you want to throw an error on a cache miss, you can do so by providing a
-#'   function for \code{missing} that takes one argument, the key, and also use
-#'   \code{exec_missing=TRUE}.
-#'
-#'   When the cache is created, you can supply a value for \code{missing}, which
-#'   sets the default value to be returned for missing values. It can also be
-#'   overridden when \code{get()} is called, by supplying a \code{missing}
-#'   argument. For example, if you use \code{cache$get("mykey", missing =
-#'   NULL)}, it will return \code{NULL} if the key is not in the cache.
-#'
-#'   If your cache is configured so that \code{get()} returns a sentinel value
-#'   to represent a cache miss, then \code{set} will also not allow you to store
-#'   the sentinel value in the cache. It will throw an error if you attempt to
-#'   do so.
-#'
-#'   Instead of returning the same sentinel value each time there is cache miss,
-#'   the cache can execute a function each time \code{get()} encounters missing
-#'   key. If the function returns a value, then \code{get()} will in turn return
-#'   that value. However, a more common use is for the function to throw an
-#'   error. If an error is thrown, then \code{get()} will not return a value.
-#'
-#'   To do this, pass a one-argument function to \code{missing}, and use
-#'   \code{exec_missing=TRUE}. For example, if you want to throw an error that
-#'   prints the missing key, you could do this:
-#'
-#'   \preformatted{
-#'   diskCache(
-#'     missing = function(key) {
-#'       stop("Attempted to get missing key: ", key)
-#'     },
-#'     exec_missing = TRUE
-#'   )
-#'   }
-#'
-#'   If you use this, the code that calls \code{get()} should be wrapped with
-#'   \code{\link{tryCatch}()} to gracefully handle missing keys.
-#'
-#' @section Cache pruning:
-#'
-#'   Cache pruning occurs when \code{set()} is called, or it can be invoked
-#'   manually by calling \code{prune()}.
-#'
-#'   The disk cache will throttle the pruning so that it does not happen on
-#'   every call to \code{set()}, because the filesystem operations for checking
-#'   the status of files can be slow. Instead, it will prune once in every 20
-#'   calls to \code{set()}, or if at least 5 seconds have elapsed since the last
-#'   prune occurred, whichever is first. These parameters are currently not
-#'   customizable, but may be in the future.
-#'
-#'   When a pruning occurs, if there are any objects that are older than
-#'   \code{max_age}, they will be removed.
-#'
-#'   The \code{max_size} and \code{max_n} parameters are applied to the cache as
-#'   a whole, in contrast to \code{max_age}, which is applied to each object
-#'   individually.
-#'
-#'   If the number of objects in the cache exceeds \code{max_n}, then objects
-#'   will be removed from the cache according to the eviction policy, which is
-#'   set with the \code{evict} parameter. Objects will be removed so that the
-#'   number of items is \code{max_n}.
-#'
-#'   If the size of the objects in the cache exceeds \code{max_size}, then
-#'   objects will be removed from the cache. Objects will be removed from the
-#'   cache so that the total size remains under \code{max_size}. Note that the
-#'   size is calculated using the size of the files, not the size of disk space
-#'   used by the files -- these two values can differ because of files are
-#'   stored in blocks on disk. For example, if the block size is 4096 bytes,
-#'   then a file that is one byte in size will take 4096 bytes on disk.
-#'
-#'   Another time that objects can be removed from the cache is when
-#'   \code{get()} is called. If the target object is older than \code{max_age},
-#'   it will be removed and the cache will report it as a missing value.
-#'
-#' @section Eviction policies:
-#'
-#' If \code{max_n} or \code{max_size} are used, then objects will be removed
-#' from the cache according to an eviction policy. The available eviction
-#' policies are:
-#'
-#'   \describe{
-#'     \item{\code{"lru"}}{
-#'       Least Recently Used. The least recently used objects will be removed.
-#'       This uses the filesystem's mtime property. When "lru" is used, each
-#'       \code{get()} is called, it will update the file's mtime.
-#'     }
-#'     \item{\code{"fifo"}}{
-#'       First-in-first-out. The oldest objects will be removed.
-#'     }
-#'   }
-#'
-#' Both of these policies use files' mtime. Note that some filesystems (notably
-#' FAT) have poor mtime resolution. (atime is not used because support for
-#' atime is worse than mtime.)
-#'
-#'
-#' @section Sharing among multiple processes:
-#'
-#' The directory for a DiskCache can be shared among multiple R processes. To
-#' do this, each R process should have a DiskCache object that uses the same
-#' directory. Each DiskCache will do pruning independently of the others, so if
-#' they have different pruning parameters, then one DiskCache may remove cached
-#' objects before another DiskCache would do so.
-#'
-#' Even though it is possible for multiple processes to share a DiskCache
-#' directory, this should not be done on networked file systems, because of
-#' slow performance of networked file systems can cause problems. If you need
-#' a high-performance shared cache, you can use one built on a database like
-#' Redis, SQLite, mySQL, or similar.
-#'
-#' When multiple processes share a cache directory, there are some potential
-#' race conditions. For example, if your code calls \code{exists(key)} to check
-#' if an object is in the cache, and then call \code{get(key)}, the object may
-#' be removed from the cache in between those two calls, and \code{get(key)}
-#' will throw an error. Instead of calling the two functions, it is better to
-#' simply call \code{get(key)}, and use \code{tryCatch()} to handle the error
-#' that is thrown if the object is not in the cache. This effectively tests for
-#' existence and gets the object in one operation.
-#'
-#' It is also possible for one processes to prune objects at the same time that
-#' another processes is trying to prune objects. If this happens, you may see
-#' a warning from \code{file.remove()} failing to remove a file that has
-#' already been deleted.
-#'
-#'
-#' @section Methods:
-#'
-#'  A disk cache object has the following methods:
-#'
-#'   \describe{
-#'     \item{\code{get(key, missing, exec_missing)}}{
-#'       Returns the value associated with \code{key}. If the key is not in the
-#'       cache, then it returns the value specified by \code{missing} or,
-#'       \code{missing} is a function and \code{exec_missing=TRUE}, then
-#'       executes \code{missing}. The function can throw an error or return the
-#'       value. If either of these parameters are specified here, then they
-#'       will override the defaults that were set when the DiskCache object was
-#'       created. See section Missing Keys for more information.
-#'     }
-#'     \item{\code{set(key, value)}}{
-#'       Stores the \code{key}-\code{value} pair in the cache.
-#'     }
-#'     \item{\code{exists(key)}}{
-#'       Returns \code{TRUE} if the cache contains the key, otherwise
-#'       \code{FALSE}.
-#'     }
-#'     \item{\code{size()}}{
-#'       Returns the number of items currently in the cache.
-#'     }
-#'     \item{\code{keys()}}{
-#'       Returns a character vector of all keys currently in the cache.
-#'     }
-#'     \item{\code{reset()}}{
-#'       Clears all objects from the cache.
-#'     }
-#'     \item{\code{destroy()}}{
-#'       Clears all objects in the cache, and removes the cache directory from
-#'       disk.
-#'     }
-#'     \item{\code{prune()}}{
-#'       Prunes the cache, using the parameters specified by \code{max_size},
-#'       \code{max_age}, \code{max_n}, and \code{evict}.
-#'     }
-#'   }
-#'
-#' @param dir Directory to store files for the cache. If \code{NULL} (the
-#'   default) it will create and use a temporary directory.
-#' @param max_age Maximum age of files in cache before they are evicted, in
-#'   seconds. Use \code{Inf} for no age limit.
-#' @param max_size Maximum size of the cache, in bytes. If the cache exceeds
-#'   this size, cached objects will be removed according to the value of the
-#'   \code{evict}. Use \code{Inf} for no size limit.
-#' @param max_n Maximum number of objects in the cache. If the number of objects
-#'   exceeds this value, then cached objects will be removed according to the
-#'   value of \code{evict}. Use \code{Inf} for no limit of number of items.
-#' @param evict The eviction policy to use to decide which objects are removed
-#'   when a cache pruning occurs. Currently, \code{"lru"} and \code{"fifo"} are
-#'   supported.
-#' @param destroy_on_finalize If \code{TRUE}, then when the DiskCache object is
-#'   garbage collected, the cache directory and all objects inside of it will be
-#'   deleted from disk. If \code{FALSE} (the default), it will do nothing when
-#'   finalized.
-#' @param missing A value to return or a function to execute when
-#'   \code{get(key)} is called but the key is not present in the cache. The
-#'   default is a \code{\link{key_missing}} object. If it is a function to
-#'   execute, the function must take one argument (the key), and you must also
-#'   use \code{exec_missing = TRUE}. If it is a function, it is useful in most
-#'   cases for it to throw an error, although another option is to return a
-#'   value. If a value is returned, that value will in turn be returned by
-#'   \code{get()}. See section Missing keys for more information.
-#' @param exec_missing If \code{FALSE} (the default), then treat \code{missing}
-#'   as a value to return when \code{get()} results in a cache miss. If
-#'   \code{TRUE}, treat \code{missing} as a function to execute when
-#'   \code{get()} results in a cache miss.
-#' @param logfile An optional filename or connection object to where logging
-#'   information will be written. To log to the console, use \code{stdout()}.
-#'
-#' @export
-diskCache <- function(
-  dir = NULL,
-  max_size = 10 * 1024 ^ 2,
-  max_age = Inf,
-  max_n = Inf,
-  evict = c("lru", "fifo"),
-  destroy_on_finalize = FALSE,
-  missing = key_missing(),
-  exec_missing = FALSE,
-  logfile = NULL)
-{
-  DiskCache$new(dir, max_size, max_age, max_n, evict, destroy_on_finalize,
-                missing, exec_missing, logfile)
-}
-
-
-DiskCache <- R6Class("DiskCache",
-  public = list(
-    initialize = function(
-      dir = NULL,
-      max_size = 10 * 1024 ^ 2,
-      max_age = Inf,
-      max_n = Inf,
-      evict = c("lru", "fifo"),
-      destroy_on_finalize = FALSE,
-      missing = key_missing(),
-      exec_missing = FALSE,
-      logfile = NULL)
-    {
-      if (exec_missing && (!is.function(missing) || length(formals(missing)) == 0)) {
-        stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-      }
-      if (is.null(dir)) {
-        dir <- tempfile("DiskCache-")
-      }
-      if (!is.numeric(max_size)) stop("max_size must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_age))  stop("max_age must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_n))    stop("max_n must be a number. Use `Inf` for no limit.")
-
-      if (!dirExists(dir)) {
-        private$log(paste0("initialize: Creating ", dir))
-        dir.create(dir, recursive = TRUE)
-      }
-
-      private$dir                 <- normalizePath(dir)
-      private$max_size            <- max_size
-      private$max_age             <- max_age
-      private$max_n               <- max_n
-      private$evict               <- match.arg(evict)
-      private$destroy_on_finalize <- destroy_on_finalize
-      private$missing             <- missing
-      private$exec_missing        <- exec_missing
-      private$logfile             <- logfile
-
-      private$prune_last_time     <- as.numeric(Sys.time())
-    },
-
-    get = function(key, missing = private$missing, exec_missing = private$exec_missing) {
-      private$log(paste0('get: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-
-      private$maybe_prune_single(key)
-
-      filename <- private$key_to_filename(key)
-
-      # Instead of calling exists() before fetching the value, just try to
-      # fetch the value. This reduces the risk of a race condition when
-      # multiple processes share a cache.
-      read_error <- FALSE
-      tryCatch(
-        {
-          value <- suppressWarnings(readRDS(filename))
-          if (private$evict == "lru"){
-            Sys.setFileTime(filename, Sys.time())
-          }
-        },
-        error = function(e) {
-          read_error <<- TRUE
-        }
-      )
-      if (read_error) {
-        private$log(paste0('get: key "', key, '" is missing'))
-
-        if (exec_missing) {
-          if (!is.function(missing) || length(formals(missing)) == 0) {
-            stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-          }
-          return(missing(key))
-        } else {
-          return(missing)
-        }
-      }
-
-      private$log(paste0('get: key "', key, '" found'))
-      value
-    },
-
-    set = function(key, value) {
-      private$log(paste0('set: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-
-      file <- private$key_to_filename(key)
-      temp_file <- paste0(file, "-temp-", createUniqueId(8))
-
-      save_error <- FALSE
-      ref_object <- FALSE
-      tryCatch(
-        {
-          saveRDS(value, file = temp_file,
-            refhook = function(x) {
-              ref_object <<- TRUE
-              NULL
-            }
-          )
-          file.rename(temp_file, file)
-        },
-        error = function(e) {
-          save_error <<- TRUE
-          # Unlike file.remove(), unlink() does not raise warning if file does
-          # not exist.
-          unlink(temp_file)
-        }
-      )
-      if (save_error) {
-        private$log(paste0('set: key "', key, '" error'))
-        stop('Error setting value for key "', key, '".')
-      }
-      if (ref_object) {
-        private$log(paste0('set: value is a reference object'))
-        warning("A reference object was cached in a serialized format. The restored object may not work as expected.")
-      }
-
-      private$prune_throttled()
-      invisible(self)
-    },
-
-    exists = function(key) {
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-      file.exists(private$key_to_filename(key))
-    },
-
-    # Return all keys in the cache
-    keys = function() {
-      self$is_destroyed(throw = TRUE)
-      files <- dir(private$dir, "\\.rds$")
-      sub("\\.rds$", "", files)
-    },
-
-    remove = function(key) {
-      private$log(paste0('remove: key "', key, '"'))
-      self$is_destroyed(throw = TRUE)
-      validate_key(key)
-      file.remove(private$key_to_filename(key))
-      invisible(self)
-    },
-
-    reset = function() {
-      private$log(paste0('reset'))
-      self$is_destroyed(throw = TRUE)
-      file.remove(dir(private$dir, "\\.rds$", full.names = TRUE))
-      invisible(self)
-    },
-
-    prune = function() {
-      # TODO: It would be good to add parameters `n` and `size`, so that the
-      # cache can be pruned to `max_n - n` and `max_size - size` before adding
-      # an object. Right now we prune after adding the object, so the cache
-      # can temporarily grow past the limits. The reason we don't do this now
-      # is because it is expensive to find the size of the serialized object
-      # before adding it.
-
-      private$log(paste0('prune'))
-      self$is_destroyed(throw = TRUE)
-
-      current_time <- Sys.time()
-
-      filenames <- dir(private$dir, "\\.rds$", full.names = TRUE)
-      info <- file.info(filenames)
-      info <- info[info$isdir == FALSE, ]
-      info$name <- rownames(info)
-      rownames(info) <- NULL
-      # Files could be removed between the dir() and file.info() calls. The
-      # entire row for such files will have NA values. Remove those rows.
-      info <- info[!is.na(info$size), ]
-
-      # 1. Remove any files where the age exceeds max age.
-      if (is.finite(private$max_age)) {
-        timediff <- as.numeric(current_time - info$mtime, units = "secs")
-        rm_idx <- timediff > private$max_age
-        if (any(rm_idx)) {
-          private$log(paste0("prune max_age: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-          file.remove(info$name[rm_idx])
-          info <- info[!rm_idx, ]
-        }
-      }
-
-      # Sort objects by priority. The sorting is done in a function which can be
-      # called multiple times but only does the work the first time.
-      info_is_sorted <- FALSE
-      ensure_info_is_sorted <- function() {
-        if (info_is_sorted) return()
-
-        info <<- info[order(info$mtime, decreasing = TRUE), ]
-        info_is_sorted <<- TRUE
-      }
-
-      # 2. Remove files if there are too many.
-      if (is.finite(private$max_n) && nrow(info) > private$max_n) {
-        ensure_info_is_sorted()
-        rm_idx <- seq_len(nrow(info)) > private$max_n
-        private$log(paste0("prune max_n: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-        rm_success <- file.remove(info$name[rm_idx])
-        info <- info[!rm_success, ]
-      }
-
-      # 3. Remove files if cache is too large.
-      if (is.finite(private$max_size) && sum(info$size) > private$max_size) {
-        ensure_info_is_sorted()
-        cum_size <- cumsum(info$size)
-        rm_idx <- cum_size > private$max_size
-        private$log(paste0("prune max_size: Removing ", paste(info$name[rm_idx], collapse = ", ")))
-        rm_success <- file.remove(info$name[rm_idx])
-        info <- info[!rm_success, ]
-      }
-
-      private$prune_last_time <- as.numeric(current_time)
-
-      invisible(self)
-    },
-
-    size = function() {
-      self$is_destroyed(throw = TRUE)
-      length(dir(private$dir, "\\.rds$"))
-    },
-
-    destroy = function() {
-      if (self$is_destroyed()) {
-        return(invisible(self))
-      }
-
-      private$log(paste0("destroy: Removing ", private$dir))
-      # First create a sentinel file so that other processes sharing this
-      # cache know that the cache is to be destroyed. This is needed because
-      # the recursive unlink is not atomic: another process can add a file to
-      # the directory after unlink starts removing files but before it removes
-      # the directory, and when that happens, the directory removal will fail.
-      file.create(file.path(private$dir, "__destroyed__"))
-      # Remove all the .rds files. This will not remove the setinel file.
-      file.remove(dir(private$dir, "\\.rds$", full.names = TRUE))
-      # Next remove dir recursively, including sentinel file.
-      unlink(private$dir, recursive = TRUE)
-      private$destroyed <- TRUE
-      invisible(self)
-    },
-
-    is_destroyed = function(throw = FALSE) {
-      if (!dirExists(private$dir) ||
-          file.exists(file.path(private$dir, "__destroyed__")))
-      {
-        # It's possible for another process to destroy a shared cache directory
-        private$destroyed <- TRUE
-      }
-
-      if (throw) {
-        if (private$destroyed) {
-          stop("Attempted to use cache which has been destroyed:\n  ", private$dir)
-        }
-
-      } else {
-        private$destroyed
-      }
-    },
-
-    finalize = function() {
-      if (private$destroy_on_finalize) {
-        self$destroy()
-      }
-    }
-  ),
-
-  private = list(
-    dir = NULL,
-    max_age = NULL,
-    max_size = NULL,
-    max_n = NULL,
-    evict = NULL,
-    destroy_on_finalize = NULL,
-    destroyed = FALSE,
-    missing = NULL,
-    exec_missing = FALSE,
-    logfile = NULL,
-
-    prune_throttle_counter = 0,
-    prune_last_time = NULL,
-
-    key_to_filename = function(key) {
-      validate_key(key)
-      # Additional validation. This 80-char limit is arbitrary, and is
-      # intended to avoid hitting a filename length limit on Windows.
-      if (nchar(key) > 80) {
-        stop("Invalid key: key must have fewer than 80 characters.")
-      }
-      file.path(private$dir, paste0(key, ".rds"))
-    },
-
-    # A wrapper for prune() that throttles it, because prune() can be
-    # expensive due to filesystem operations. This function will prune only
-    # once every 20 times it is called, or if it has been more than 5 seconds
-    # since the last time the cache was actually pruned, whichever is first.
-    # In the future, the behavior may be customizable.
-    prune_throttled = function() {
-      # Count the number of times prune() has been called.
-      private$prune_throttle_counter <- private$prune_throttle_counter + 1
-
-      if (private$prune_throttle_counter > 20 ||
-          private$prune_last_time - as.numeric(Sys.time()) > 5)
-      {
-        self$prune()
-        private$prune_throttle_counter <- 0
-      }
-    },
-
-    # Prunes a single object if it exceeds max_age. If the object does not
-    # exceed max_age, or if the object doesn't exist, do nothing.
-    maybe_prune_single = function(key) {
-      obj <- private$cache[[key]]
-      if (is.null(obj)) return()
-
-      timediff <- as.numeric(Sys.time()) - obj$mtime
-      if (timediff > private$max_age) {
-        private$log(paste0("pruning single object exceeding max_age: Removing ", key))
-        rm(list = key, envir = private$cache)
-      }
-    },
-
-    log = function(text) {
-      if (is.null(private$logfile)) return()
-
-      text <- paste0(format(Sys.time(), "[%Y-%m-%d %H:%M:%OS3] DiskCache "), text)
-      writeLines(text, private$logfile)
-    }
-  )
-)

R/cache-memory.R

@@ -1,366 +0,0 @@
-#' Create a memory cache object
-#'
-#' A memory cache object is a key-value store that saves the values in an
-#' environment. Objects can be stored and retrieved using the \code{get()} and
-#' \code{set()} methods. Objects are automatically pruned from the cache
-#' according to the parameters \code{max_size}, \code{max_age}, \code{max_n},
-#' and \code{evict}.
-#'
-#' In a \code{MemoryCache}, R objects are stored directly in the cache; they are
-#' not \emph{not} serialized before being stored in the cache. This contrasts
-#' with other cache types, like \code{\link{diskCache}}, where objects are
-#' serialized, and the serialized object is cached. This can result in some
-#' differences of behavior. For example, as long as an object is stored in a
-#' MemoryCache, it will not be garbage collected.
-#'
-#'
-#' @section Missing keys:
-#'   The \code{missing} and \code{exec_missing} parameters controls what happens
-#'   when \code{get()} is called with a key that is not in the cache (a cache
-#'   miss). The default behavior is to return a \code{\link{key_missing}}
-#'   object. This is a \emph{sentinel value} that indicates that the key was not
-#'   present in the cache. You can test if the returned value represents a
-#'   missing key by using the \code{\link{is.key_missing}} function. You can
-#'   also have \code{get()} return a different sentinel value, like \code{NULL}.
-#'   If you want to throw an error on a cache miss, you can do so by providing a
-#'   function for \code{missing} that takes one argument, the key, and also use
-#'   \code{exec_missing=TRUE}.
-#'
-#'   When the cache is created, you can supply a value for \code{missing}, which
-#'   sets the default value to be returned for missing values. It can also be
-#'   overridden when \code{get()} is called, by supplying a \code{missing}
-#'   argument. For example, if you use \code{cache$get("mykey", missing =
-#'   NULL)}, it will return \code{NULL} if the key is not in the cache.
-#'
-#'   If your cache is configured so that \code{get()} returns a sentinel value
-#'   to represent a cache miss, then \code{set} will also not allow you to store
-#'   the sentinel value in the cache. It will throw an error if you attempt to
-#'   do so.
-#'
-#'   Instead of returning the same sentinel value each time there is cache miss,
-#'   the cache can execute a function each time \code{get()} encounters missing
-#'   key. If the function returns a value, then \code{get()} will in turn return
-#'   that value. However, a more common use is for the function to throw an
-#'   error. If an error is thrown, then \code{get()} will not return a value.
-#'
-#'   To do this, pass a one-argument function to \code{missing}, and use
-#'   \code{exec_missing=TRUE}. For example, if you want to throw an error that
-#'   prints the missing key, you could do this:
-#'
-#'   \preformatted{
-#'   diskCache(
-#'     missing = function(key) {
-#'       stop("Attempted to get missing key: ", key)
-#'     },
-#'     exec_missing = TRUE
-#'   )
-#'   }
-#'
-#'   If you use this, the code that calls \code{get()} should be wrapped with
-#'   \code{\link{tryCatch}()} to gracefully handle missing keys.
-#'
-#' @section Cache pruning:
-#'
-#'   Cache pruning occurs when \code{set()} is called, or it can be invoked
-#'   manually by calling \code{prune()}.
-#'
-#'   When a pruning occurs, if there are any objects that are older than
-#'   \code{max_age}, they will be removed.
-#'
-#'   The \code{max_size} and \code{max_n} parameters are applied to the cache as
-#'   a whole, in contrast to \code{max_age}, which is applied to each object
-#'   individually.
-#'
-#'   If the number of objects in the cache exceeds \code{max_n}, then objects
-#'   will be removed from the cache according to the eviction policy, which is
-#'   set with the \code{evict} parameter. Objects will be removed so that the
-#'   number of items is \code{max_n}.
-#'
-#'   If the size of the objects in the cache exceeds \code{max_size}, then
-#'   objects will be removed from the cache. Objects will be removed from the
-#'   cache so that the total size remains under \code{max_size}. Note that the
-#'   size is calculated using the size of the files, not the size of disk space
-#'   used by the files -- these two values can differ because of files are
-#'   stored in blocks on disk. For example, if the block size is 4096 bytes,
-#'   then a file that is one byte in size will take 4096 bytes on disk.
-#'
-#'   Another time that objects can be removed from the cache is when
-#'   \code{get()} is called. If the target object is older than \code{max_age},
-#'   it will be removed and the cache will report it as a missing value.
-#'
-#' @section Eviction policies:
-#'
-#' If \code{max_n} or \code{max_size} are used, then objects will be removed
-#' from the cache according to an eviction policy. The available eviction
-#' policies are:
-#'
-#'   \describe{
-#'     \item{\code{"lru"}}{
-#'       Least Recently Used. The least recently used objects will be removed.
-#'       This uses the filesystem's atime property. Some filesystems do not
-#'       support atime, or have a very low atime resolution. The DiskCache will
-#'       check for atime support, and if the filesystem does not support atime,
-#'       a warning will be issued and the "fifo" policy will be used instead.
-#'     }
-#'     \item{\code{"fifo"}}{
-#'       First-in-first-out. The oldest objects will be removed.
-#'     }
-#'   }
-#'
-#' @section Methods:
-#'
-#'  A disk cache object has the following methods:
-#'
-#'   \describe{
-#'     \item{\code{get(key, missing, exec_missing)}}{
-#'       Returns the value associated with \code{key}. If the key is not in the
-#'       cache, then it returns the value specified by \code{missing} or,
-#'       \code{missing} is a function and \code{exec_missing=TRUE}, then
-#'       executes \code{missing}. The function can throw an error or return the
-#'       value. If either of these parameters are specified here, then they
-#'       will override the defaults that were set when the DiskCache object was
-#'       created. See section Missing Keys for more information.
-#'     }
-#'     \item{\code{set(key, value)}}{
-#'       Stores the \code{key}-\code{value} pair in the cache.
-#'     }
-#'     \item{\code{exists(key)}}{
-#'       Returns \code{TRUE} if the cache contains the key, otherwise
-#'       \code{FALSE}.
-#'     }
-#'     \item{\code{size()}}{
-#'       Returns the number of items currently in the cache.
-#'     }
-#'     \item{\code{keys()}}{
-#'       Returns a character vector of all keys currently in the cache.
-#'     }
-#'     \item{\code{reset()}}{
-#'       Clears all objects from the cache.
-#'     }
-#'     \item{\code{destroy()}}{
-#'       Clears all objects in the cache, and removes the cache directory from
-#'       disk.
-#'     }
-#'     \item{\code{prune()}}{
-#'       Prunes the cache, using the parameters specified by \code{max_size},
-#'       \code{max_age}, \code{max_n}, and \code{evict}.
-#'     }
-#'   }
-#'
-#' @inheritParams diskCache
-#'
-#' @export
-memoryCache <- function(
-  max_size = 10 * 1024 ^ 2,
-  max_age = Inf,
-  max_n = Inf,
-  evict = c("lru", "fifo"),
-  missing = key_missing(),
-  exec_missing = FALSE,
-  logfile = NULL)
-{
-  MemoryCache$new(max_size, max_age, max_n, evict, missing, exec_missing, logfile)
-}
-
-MemoryCache <- R6Class("MemoryCache",
-  public = list(
-    initialize = function(
-      max_size = 10 * 1024 ^ 2,
-      max_age = Inf,
-      max_n = Inf,
-      evict = c("lru", "fifo"),
-      missing = key_missing(),
-      exec_missing = FALSE,
-      logfile = NULL)
-    {
-      if (exec_missing && (!is.function(missing) || length(formals(missing)) == 0)) {
-        stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-      }
-      if (!is.numeric(max_size)) stop("max_size must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_age))  stop("max_age must be a number. Use `Inf` for no limit.")
-      if (!is.numeric(max_n))    stop("max_n must be a number. Use `Inf` for no limit.")
-      private$cache        <- new.env(parent = emptyenv())
-      private$max_size     <- max_size
-      private$max_age      <- max_age
-      private$max_n        <- max_n
-      private$evict        <- match.arg(evict)
-      private$missing      <- missing
-      private$exec_missing <- exec_missing
-      private$logfile      <- logfile
-    },
-
-    get = function(key, missing = private$missing, exec_missing = private$exec_missing) {
-      private$log(paste0('get: key "', key, '"'))
-      validate_key(key)
-
-      private$maybe_prune_single(key)
-
-      if (!self$exists(key)) {
-        private$log(paste0('get: key "', key, '" is missing'))
-        if (exec_missing) {
-          if (!is.function(missing) || length(formals(missing)) == 0) {
-            stop("When `exec_missing` is true, `missing` must be a function that takes one argument.")
-          }
-          return(missing(key))
-        } else {
-          return(missing)
-        }
-      }
-
-      private$log(paste0('get: key "', key, '" found'))
-      value <- private$cache[[key]]$value
-      value
-    },
-
-    set = function(key, value) {
-      private$log(paste0('set: key "', key, '"'))
-      validate_key(key)
-
-      time <- as.numeric(Sys.time())
-
-      # Only record size if we're actually using max_size for pruning.
-      if (is.finite(private$max_size)) {
-        # Reported size is rough! See ?object.size.
-        size <- as.numeric(object.size(value))
-      } else {
-        size <- NULL
-      }
-
-      private$cache[[key]] <- list(
-        key = key,
-        value = value,
-        size = size,
-        mtime = time,
-        atime = time
-      )
-      self$prune()
-      invisible(self)
-    },
-
-    exists = function(key) {
-      validate_key(key)
-      # Faster than `exists(key, envir = private$cache, inherits = FALSE)
-      !is.null(private$cache[[key]])
-    },
-
-    keys = function() {
-      ls(private$cache, sorted = FALSE)  # Faster with sorted=FALSE
-    },
-
-    remove = function(key) {
-      private$log(paste0('remove: key "', key, '"'))
-      validate_key(key)
-      rm(list = key, envir = private$cache)
-      invisible(self)
-    },
-
-    reset = function() {
-      private$log(paste0('reset'))
-      rm(list = self$keys(), envir = private$cache)
-      invisible(self)
-    },
-
-    prune = function() {
-      private$log(paste0('prune'))
-      info <- private$object_info()
-
-      # 1. Remove any objects where the age exceeds max age.
-      if (is.finite(private$max_age)) {
-        time <- as.numeric(Sys.time())
-        timediff <- time - info$mtime
-        rm_idx <- timediff > private$max_age
-        if (any(rm_idx)) {
-          private$log(paste0("prune max_age: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-          rm(list = info$key[rm_idx], envir = private$cache)
-          info <- info[!rm_idx, ]
-        }
-      }
-
-      # Sort objects by priority, according to eviction policy. The sorting is
-      # done in a function which can be called multiple times but only does
-      # the work the first time.
-      info_is_sorted <- FALSE
-      ensure_info_is_sorted <- function() {
-        if (info_is_sorted) return()
-
-        if (private$evict == "lru") {
-          info <<- info[order(info$atime, decreasing = TRUE), ]
-        } else if (private$evict == "fifo") {
-          info <<- info[order(info$mtime, decreasing = TRUE), ]
-        } else {
-          stop('Unknown eviction policy "', private$evict, '"')
-        }
-        info_is_sorted <<- TRUE
-      }
-
-      # 2. Remove objects if there are too many.
-      if (is.finite(private$max_n) && nrow(info) > private$max_n) {
-        ensure_info_is_sorted()
-        rm_idx <- seq_len(nrow(info)) > private$max_n
-        private$log(paste0("prune max_n: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-        rm(list = info$key[rm_idx], envir = private$cache)
-        info <- info[!rm_idx, ]
-      }
-
-      # 3. Remove objects if cache is too large.
-      if (is.finite(private$max_size) && sum(info$size) > private$max_size) {
-        ensure_info_is_sorted()
-        cum_size <- cumsum(info$size)
-        rm_idx <- cum_size > private$max_size
-        private$log(paste0("prune max_size: Removing ", paste(info$key[rm_idx], collapse = ", ")))
-        rm(list = info$key[rm_idx], envir = private$cache)
-        info <- info[!rm_idx, ]
-      }
-
-      invisible(self)
-    },
-
-    size = function() {
-      length(self$keys())
-    }
-  ),
-
-  private = list(
-    cache = NULL,
-    max_age = NULL,
-    max_size = NULL,
-    max_n = NULL,
-    evict = NULL,
-    missing = NULL,
-    exec_missing = NULL,
-    logfile = NULL,
-
-    # Prunes a single object if it exceeds max_age. If the object does not
-    # exceed max_age, or if the object doesn't exist, do nothing.
-    maybe_prune_single = function(key) {
-      if (!is.finite(private$max_age)) return()
-
-      obj <- private$cache[[key]]
-      if (is.null(obj)) return()
-
-      timediff <- as.numeric(Sys.time()) - obj$mtime
-      if (timediff > private$max_age) {
-        private$log(paste0("pruning single object exceeding max_age: Removing ", key))
-        rm(list = key, envir = private$cache)
-      }
-    },
-
-    object_info = function() {
-      keys <- ls(private$cache, sorted = FALSE)
-      data.frame(
-        key   = keys,
-        size  = vapply(keys, function(key) private$cache[[key]]$size,  0),
-        mtime = vapply(keys, function(key) private$cache[[key]]$mtime, 0),
-        atime = vapply(keys, function(key) private$cache[[key]]$atime, 0),
-        stringsAsFactors = FALSE
-      )
-    },
-
-    log = function(text) {
-      if (is.null(private$logfile)) return()
-
-      text <- paste0(format(Sys.time(), "[%Y-%m-%d %H:%M:%OS3] MemoryCache "), text)
-      writeLines(text, private$logfile)
-    }
-  )
-)

R/cache-utils.R

@@ -1,33 +0,0 @@
-#' A Key Missing object
-#'
-#' A \code{key_missing} object represents a cache miss.
-#'
-#' @param x An object to test.
-#'
-#' @seealso \code{\link{diskCache}}, \code{\link{memoryCache}}.
-#'
-#' @export
-key_missing <- function() {
-  structure(list(), class = "key_missing")
-}
-
-#' @rdname key_missing
-#' @export
-is.key_missing <- function(x) {
-  inherits(x, "key_missing")
-}
-
-#' @export
-print.key_missing <- function(x, ...) {
-  cat("<Key Missing>\n")
-}
-
-
-validate_key <- function(key) {
-  if (!is.character(key) || length(key) != 1 || nchar(key) == 0) {
-    stop("Invalid key: key must be single non-empty string.")
-  }
-  if (grepl("[^a-z0-9]", key)) {
-    stop("Invalid key: ", key, ". Only lowercase letters and numbers are allowed.")
-  }
-}

R/conditions.R

@@ -131,17 +131,15 @@ captureStackTraces <- function(expr) {
 .globals$deepStack <- NULL
 
 createStackTracePromiseDomain <- function() {
-  # These are actually stateless, we wouldn't have to create a new one each time
-  # if we didn't want to. They're pretty cheap though.
-  
   d <- promises::new_promise_domain(
     wrapOnFulfilled = function(onFulfilled) {
       force(onFulfilled)
       # Subscription time
       if (deepStacksEnabled()) {
-        currentStack <- sys.calls()
-        currentParents <- sys.parents()
-        attr(currentStack, "parents") <- currentParents
+        calls <- sys.calls()
+        parents <- sys.parents()
+        attr(calls, "parents") <- parents
+        currentStack <- formatStackTrace(calls)
         currentDeepStack <- .globals$deepStack
       }
       function(...) {
@@ -162,9 +160,10 @@ createStackTracePromiseDomain <- function() {
       force(onRejected)
       # Subscription time
       if (deepStacksEnabled()) {
-        currentStack <- sys.calls()
-        currentParents <- sys.parents()
-        attr(currentStack, "parents") <- currentParents
+        calls <- sys.calls()
+        parents <- sys.parents()
+        attr(calls, "parents") <- parents
+        currentStack <- formatStackTrace(calls)
         currentDeepStack <- .globals$deepStack
       }
       function(...) {
@@ -191,7 +190,7 @@ createStackTracePromiseDomain <- function() {
 }
 
 deepStacksEnabled <- function() {
-  getOption("shiny.deepstacktrace", TRUE)
+  getOption("shiny.deepstacktrace", FALSE)
 }
 
 doCaptureStack <- function(e) {
@@ -266,11 +265,20 @@ withLogErrors <- function(expr,
 printError <- function(cond,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
-  
-  warning(call. = FALSE, immediate. = TRUE, sprintf("Error in %s: %s", 
+
+  warning(call. = FALSE, immediate. = TRUE, sprintf("Error in %s: %s",
     getCallNames(list(conditionCall(cond))), conditionMessage(cond)))
-  
   printStackTrace(cond, full = full, offset = offset)
+  lapply(rev(attr(cond, "deep.stack.trace", exact = TRUE)), function(st) {
+    message(
+      paste0(
+        "From earlier call:\n",
+        paste0(st, collapse = "\n"),
+        "\n"
+      )
+    )
+  })
+  invisible()
 }
 
 #' @rdname stacktrace
@@ -279,104 +287,71 @@ printStackTrace <- function(cond,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
-  should_drop <- !full
-  should_strip <- !full
-  should_prune <- !full
-  
-  stackTraceCalls <- c(
-    attr(cond, "deep.stack.trace", exact = TRUE),
-    list(attr(cond, "stack.trace", exact = TRUE))
-  )
-  
-  stackTraceParents <- lapply(stackTraceCalls, attr, which = "parents", exact = TRUE)
-  stackTraceCallNames <- lapply(stackTraceCalls, getCallNames)
-  stackTraceCalls <- lapply(stackTraceCalls, offsetSrcrefs, offset = offset)
-  
-  # Use dropTrivialFrames logic to remove trailing bits (.handleSimpleError, h)
-  if (should_drop) {
-    # toKeep is a list of logical vectors, of which elements (stack frames) to keep
-    toKeep <- lapply(stackTraceCallNames, dropTrivialFrames)
-    # We apply the list of logical vector indices to each data structure
-    stackTraceCalls <- mapply(stackTraceCalls, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-    stackTraceCallNames <- mapply(stackTraceCallNames, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-    stackTraceParents <- mapply(stackTraceParents, FUN = `[`, toKeep, SIMPLIFY = FALSE)
-  }
-  
-  delayedAssign("all_true", {
-    # List of logical vectors that are all TRUE, the same shape as
-    # stackTraceCallNames. Delay the evaluation so we don't create it unless
-    # we need it, but if we need it twice then we don't pay to create it twice.
-    lapply(stackTraceCallNames, function(st) {
-      rep_len(TRUE, length(st))
-    })
-  })
-  
-  # stripStackTraces and lapply(stackTraceParents, pruneStackTrace) return lists
-  # of logical vectors. Use mapply(FUN = `&`) to boolean-and each pair of the
-  # logical vectors.
-  toShow <- mapply(
-    if (should_strip) stripStackTraces(stackTraceCallNames) else all_true,
-    if (should_prune) lapply(stackTraceParents, pruneStackTrace) else all_true,
-    FUN = `&`,
-    SIMPLIFY = FALSE
-  )
-  
-  dfs <- mapply(seq_along(stackTraceCalls), rev(stackTraceCalls), rev(stackTraceCallNames), rev(toShow), FUN = function(i, calls, nms, index) {
-    st <- data.frame(
-      num = rev(which(index)),
-      call = rev(nms[index]),
-      loc = rev(getLocs(calls[index])),
-      category = rev(getCallCategories(calls[index])),
-      stringsAsFactors = FALSE
-    )
-    
-    if (i != 1) {
-      message("From earlier call:")
-    }
-
-    if (nrow(st) == 0) {
-      message("  [No stack trace available]")
-    } else {
-      width <- floor(log10(max(st$num))) + 1
-      formatted <- paste0(
-        "  ",
-        formatC(st$num, width = width),
-        ": ",
-        mapply(paste0(st$call, st$loc), st$category, FUN = function(name, category) {
-          if (category == "pkg")
-            crayon::silver(name)
-          else if (category == "user")
-            crayon::blue$bold(name)
-          else
-            crayon::white(name)
-        }),
+  stackTrace <- attr(cond, "stack.trace", exact = TRUE)
+  tryCatch(
+    if (!is.null(stackTrace)) {
+      message(paste0(
+        "Stack trace (innermost first):\n",
+        paste0(collapse = "\n",
+          formatStackTrace(stackTrace, full = full, offset = offset,
+            indent = "    ")
+        ),
         "\n"
-      )
-      cat(file = stderr(), formatted, sep = "")
-    }
+      ))
+    } else {
+      message("No stack trace available")
+    },
 
-    st
-  }, SIMPLIFY = FALSE)
-  
+    error = function(cond) {
+      warning("Failed to write stack trace: ", cond)
+    }
+  )
   invisible()
 }
 
+# Given sys.parents() (which corresponds to sys.calls()), return a logical index
+# that prunes each subtree so that only the final branch remains. The result,
+# when applied to sys.calls(), is a linear list of calls without any "wrapper"
+# functions like tryCatch, try, with, hybrid_chain, etc. While these are often
+# part of the active call stack, they rarely are helpful when trying to identify
+# a broken bit of code.
+prune <- function(parents) {
+  # Detect nodes that are not the last child. This is necessary, but not
+  # sufficient; we also need to drop nodes that are the last child, but one of
+  # their ancestors is not.
+  is_dupe <- duplicated(parents, fromLast = TRUE)
+
+  # The index of the most recently seen node that was actually kept instead of
+  # dropped.
+  current_node <- 0
+
+  # Loop over the parent indices. Anything that is not parented by current_node
+  # (a.k.a. last-known-good node), or is a dupe, can be discarded. Anything that
+  # is kept becomes the new current_node.
+  include <- vapply(seq_along(parents), function(i) {
+    if (!is_dupe[[i]] && parents[[i]] == current_node) {
+      current_node <<- i
+      TRUE
+    } else {
+      FALSE
+    }
+  }, FUN.VALUE = logical(1))
+
+  include
+}
+
 #' @details \code{extractStackTrace} takes a list of calls (e.g. as returned
 #'   from \code{conditionStackTrace(cond)}) and returns a data frame with one
 #'   row for each stack frame and the columns \code{num} (stack frame number),
 #'   \code{call} (a function name or similar), and \code{loc} (source file path
-#'   and line number, if available). It was deprecated after shiny 1.0.5 because
-#'   it doesn't support deep stack traces.
+#'   and line number, if available).
 #' @rdname stacktrace
 #' @export
 extractStackTrace <- function(calls,
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
-  
-  shinyDeprecated(NULL,
-    "extractStackTrace is deprecated. Please contact the Shiny team if you were using this functionality.",
-    version = "1.0.5")
 
+  parents <- attr(calls, "parents", exact = TRUE)
   srcrefs <- getSrcRefs(calls)
   if (offset) {
     # Offset calls vs. srcrefs by 1 to make them more intuitive.
@@ -405,6 +380,7 @@ extractStackTrace <- function(calls,
     if (toRemove > 0 && toRemove < 5) {
       calls <- utils::head(calls, -toRemove)
       callnames <- utils::head(callnames, -toRemove)
+      parents <- utils::head(parents, -toRemove)
     }
 
     # This uses a ref-counting scheme. It might make sense to switch this
@@ -415,11 +391,9 @@ extractStackTrace <- function(calls,
     score <- rep.int(0, length(callnames))
     score[callnames == "..stacktraceoff.."] <- -1
     score[callnames == "..stacktraceon.."] <- 1
-    toShow <- (1 + cumsum(score)) > 0 & !(callnames %in% c("..stacktraceon..", "..stacktraceoff..", "..stacktracefloor.."))
+    toShow <- (1 + cumsum(score)) > 0 & !(callnames %in% c("..stacktraceon..", "..stacktraceoff.."))
 
-    # doTryCatch, tryCatchOne, and tryCatchList are not informative--they're
-    # just internals for tryCatch
-    toShow <- toShow & !(callnames %in% c("doTryCatch", "tryCatchOne", "tryCatchList"))
+    toShow <- toShow & prune(parents)
   }
   calls <- calls[toShow]
 
@@ -436,110 +410,8 @@ extractStackTrace <- function(calls,
   )
 }
 
-stripStackTraces <- function(stackTraces, values = FALSE) {
-  score <- 1L  # >=1: show, <=0: hide
-  lapply(seq_along(stackTraces), function(i) {
-    res <- stripOneStackTrace(stackTraces[[i]], i != 1, score)
-    score <<- res$score
-    toShow <- as.logical(res$trace)
-    if (values) {
-      as.character(stackTraces[[i]][toShow])
-    } else {
-      as.logical(toShow)
-    }
-  })
-}
-
-stripOneStackTrace <- function(stackTrace, truncateFloor, startingScore) {
-  prefix <- logical(0)
-  if (truncateFloor) {
-    indexOfFloor <- utils::tail(which(stackTrace == "..stacktracefloor.."), 1)
-    if (length(indexOfFloor)) {
-      stackTrace <- stackTrace[(indexOfFloor+1L):length(stackTrace)]
-      prefix <- rep_len(FALSE, indexOfFloor)
-    }
-  }
-  
-  if (length(stackTrace) == 0) {
-    return(list(score = startingScore, character(0)))
-  }
-  
-  score <- rep.int(0L, length(stackTrace))
-  score[stackTrace == "..stacktraceon.."] <- 1L
-  score[stackTrace == "..stacktraceoff.."] <- -1L
-  score <- startingScore + cumsum(score)
-  
-  toShow <- score > 0 & !(stackTrace %in% c("..stacktraceon..", "..stacktraceoff..", "..stacktracefloor.."))
-  
-  
-  list(score = utils::tail(score, 1), trace = c(prefix, toShow))
-}
-
-# Given sys.parents() (which corresponds to sys.calls()), return a logical index
-# that prunes each subtree so that only the final branch remains. The result,
-# when applied to sys.calls(), is a linear list of calls without any "wrapper"
-# functions like tryCatch, try, with, hybrid_chain, etc. While these are often
-# part of the active call stack, they rarely are helpful when trying to identify
-# a broken bit of code.
-pruneStackTrace <- function(parents) {
-  # Detect nodes that are not the last child. This is necessary, but not
-  # sufficient; we also need to drop nodes that are the last child, but one of
-  # their ancestors is not.
-  is_dupe <- duplicated(parents, fromLast = TRUE)
-  
-  # The index of the most recently seen node that was actually kept instead of
-  # dropped.
-  current_node <- 0
-  
-  # Loop over the parent indices. Anything that is not parented by current_node
-  # (a.k.a. last-known-good node), or is a dupe, can be discarded. Anything that
-  # is kept becomes the new current_node.
-  include <- vapply(seq_along(parents), function(i) {
-    if (!is_dupe[[i]] && parents[[i]] == current_node) {
-      current_node <<- i
-      TRUE
-    } else {
-      FALSE
-    }
-  }, FUN.VALUE = logical(1))
-  
-  include
-}
-
-dropTrivialFrames <- function(callnames) {
-  # Remove stop(), .handleSimpleError(), and h() calls from the end of
-  # the calls--they don't add any helpful information. But only remove
-  # the last *contiguous* block of them, and then, only if they are the
-  # last thing in the calls list.
-  hideable <- callnames %in% c(".handleSimpleError", "h", "base$wrapOnFulfilled")
-  # What's the last that *didn't* match stop/.handleSimpleError/h?
-  lastGoodCall <- max(which(!hideable))
-  toRemove <- length(callnames) - lastGoodCall
-  
-  c(
-    rep_len(TRUE, length(callnames) - toRemove),
-    rep_len(FALSE, toRemove)
-  )
-}
-
-offsetSrcrefs <- function(calls, offset = TRUE) {
-  if (offset) {
-    srcrefs <- getSrcRefs(calls)
-
-    # Offset calls vs. srcrefs by 1 to make them more intuitive.
-    # E.g. for "foo [bar.R:10]", line 10 of bar.R will be part of
-    # the definition of foo().
-    srcrefs <- c(utils::tail(srcrefs, -1), list(NULL))
-    
-    calls <- setSrcRefs(calls, srcrefs)
-  }
-  
-  calls
-}
-
 #' @details \code{formatStackTrace} is similar to \code{extractStackTrace}, but
-#'   it returns a preformatted character vector instead of a data frame. It was
-#'   deprecated after shiny 1.0.5 because it doesn't support deep stack traces.
+#'   it returns a preformatted character vector instead of a data frame.
 #' @param indent A string to prefix every line of the stack trace.
 #' @rdname stacktrace
 #' @export
@@ -547,10 +419,6 @@ formatStackTrace <- function(calls, indent = "    ",
   full = getOption("shiny.fullstacktrace", FALSE),
   offset = getOption("shiny.stacktraceoffset", TRUE)) {
 
-  shinyDeprecated(NULL,
-    "extractStackTrace is deprecated. Please contact the Shiny team if you were using this functionality.",
-    version = "1.0.5")
-  
   st <- extractStackTrace(calls, full = full, offset = offset)
   if (nrow(st) == 0) {
     return(character(0))
@@ -623,5 +491,3 @@ conditionStackTrace <- function(cond) {
 #' @rdname stacktrace
 #' @export
 ..stacktraceoff.. <- function(expr) expr
-
-..stacktracefloor.. <- function(expr) expr

R/graph.R

@@ -97,8 +97,8 @@ renderReactLog <- function(sessionToken = NULL, time = TRUE) {
   .graphAppend(list(action='enter', id=id))
 }
 
-.graphExitContext <- function(id, domain) {
-  .graphAppend(list(action='exit', id=id), domain = domain)
+.graphExitContext <- function(id) {
+  .graphAppend(list(action='exit', id=id))
 }
 
 .graphValueChange <- function(label, value) {

R/image-interact.R

@@ -86,8 +86,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
   if (use_x) {
     if (is.null(xvar))
       stop("brushedPoints: not able to automatically infer `xvar` from brush")
-    if (!(xvar %in% names(df)))
-      stop("brushedPoints: `xvar` ('", xvar ,"')  not in names of input")
     # Extract data values from the data frame
     x <- asNumber(df[[xvar]])
     keep_rows <- keep_rows & (x >= brush$xmin & x <= brush$xmax)
@@ -95,8 +93,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
   if (use_y) {
     if (is.null(yvar))
       stop("brushedPoints: not able to automatically infer `yvar` from brush")
-    if (!(yvar %in% names(df)))
-      stop("brushedPoints: `yvar` ('", yvar ,"') not in names of input")
     y <- asNumber(df[[yvar]])
     keep_rows <- keep_rows & (y >= brush$ymin & y <= brush$ymax)
   }
@@ -122,19 +118,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ xmax   : num 4.22
 #  $ ymin   : num 13.9
 #  $ ymax   : num 19.8
-#  $ coords_css:List of 4
-#   ..$ xmin: int 260
-#   ..$ xmax: int 298
-#   ..$ ymin: num 112
-#   ..$ ymax: num 205
-#  $ coords_img:List of 4
-#   ..$ xmin: int 325
-#   ..$ xmax: num 372
-#   ..$ ymin: num 140
-#   ..$ ymax: num 257
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
 #  $ mapping: Named list()
 #  $ domain :List of 4
 #   ..$ left  : num 1.36
@@ -160,19 +143,6 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ ymax     : num 20.4
 #  $ panelvar1: int 6
 #  $ panelvar2: int 0
-#  $ coords_css:List of 4
-#   ..$ xmin: int 260
-#   ..$ xmax: int 298
-#   ..$ ymin: num 112
-#   ..$ ymax: num 205
-#  $ coords_img:List of 4
-#   ..$ xmin: int 325
-#   ..$ xmax: num 372
-#   ..$ ymin: num 140
-#   ..$ ymax: num 257
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
 #  $ mapping  :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"
@@ -275,29 +245,18 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
   if (is.null(yvar))
     stop("nearPoints: not able to automatically infer `yvar` from coordinfo")
 
-  if (!(xvar %in% names(df)))
-    stop("nearPoints: `xvar` ('", xvar ,"')  not in names of input")
-  if (!(yvar %in% names(df)))
-    stop("nearPoints: `yvar` ('", yvar ,"')  not in names of input")
-
   # Extract data values from the data frame
   x <- asNumber(df[[xvar]])
   y <- asNumber(df[[yvar]])
 
-  # Get the coordinates of the point (in img pixel coordinates)
-  point_img <- coordinfo$coords_img
+  # Get the pixel coordinates of the point
+  coordPx <- scaleCoords(coordinfo$x, coordinfo$y, coordinfo)
 
-  # Get coordinates of data points (in img pixel coordinates)
-  data_img <- scaleCoords(x, y, coordinfo)
+  # Get pixel coordinates of data points
+  dataPx <- scaleCoords(x, y, coordinfo)
 
-  # Get x/y distances (in css coordinates)
-  dist_css <- list(
-    x = (data_img$x - point_img$x) / coordinfo$img_css_ratio$x,
-    y = (data_img$y - point_img$y) / coordinfo$img_css_ratio$y
-  )
-
-  # Distances of data points to the target point, in css pixels.
-  dists <- sqrt(dist_css$x^2 + dist_css$y^2)
+  # Distances of data points to coordPx
+  dists <- sqrt((dataPx$x - coordPx$x) ^ 2 + (dataPx$y - coordPx$y) ^ 2)
 
   if (addDist)
     df$dist_ <- dists
@@ -339,68 +298,50 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
 # The coordinfo data structure will look something like the examples below.
 # For base graphics, `mapping` is empty, and there are no panelvars:
 # List of 7
-#  $ x         : num 4.37
-#  $ y         : num 12
-#  $ coords_css:List of 2
-#   ..$ x: int 286
-#   ..$ y: int 192
-#  $ coords_img:List of 2
-#   ..$ x: num 358
-#   ..$ y: int 240
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
-#  $ mapping   : Named list()
-#  $ domain    :List of 4
+#  $ x      : num 4.37
+#  $ y      : num 12
+#  $ mapping: Named list()
+#  $ domain :List of 4
 #   ..$ left  : num 1.36
 #   ..$ right : num 5.58
 #   ..$ bottom: num 9.46
 #   ..$ top   : num 34.8
-#  $ range     :List of 4
+#  $ range  :List of 4
 #   ..$ left  : num 58
 #   ..$ right : num 429
 #   ..$ bottom: num 226
 #   ..$ top   : num 58
-#  $ log       :List of 2
+#  $ log    :List of 2
 #   ..$ x: NULL
 #   ..$ y: NULL
-#  $ .nonce    : num 0.343
+#  $ .nonce : num 0.343
 #
 # For ggplot2, the mapping vars usually will be included, and if faceting is
 # used, they will be listed as panelvars:
 # List of 9
-#  $ x         : num 3.78
-#  $ y         : num 17.1
-#  $ coords_css:List of 2
-#   ..$ x: int 286
-#   ..$ y: int 192
-#  $ coords_img:List of 2
-#   ..$ x: num 358
-#   ..$ y: int 240
-#  $ img_css_ratio:List of 2
-#   ..$ x: num 1.25
-#   ..$ y: num 1.25
-#  $ panelvar1 : int 6
-#  $ panelvar2 : int 0
-#  $ mapping   :List of 4
+#  $ x        : num 3.78
+#  $ y        : num 17.1
+#  $ panelvar1: int 6
+#  $ panelvar2: int 0
+#  $ mapping  :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"
 #   ..$ panelvar1: chr "cyl"
 #   ..$ panelvar2: chr "am"
-#  $ domain    :List of 4
+#  $ domain   :List of 4
 #   ..$ left  : num 1.32
 #   ..$ right : num 5.62
 #   ..$ bottom: num 9.22
 #   ..$ top   : num 35.1
-#  $ range     :List of 4
+#  $ range    :List of 4
 #   ..$ left  : num 172
 #   ..$ right : num 300
 #   ..$ bottom: num 144
 #   ..$ top   : num 28.5
-#  $ log       :List of 2
+#  $ log      :List of 2
 #   ..$ x: NULL
 #   ..$ y: NULL
-#  $ .nonce    : num 0.603
+#  $ .nonce   : num 0.603
 
 
 

R/input-date.R

@@ -34,20 +34,13 @@
 #' @param weekstart Which day is the start of the week. Should be an integer
 #'   from 0 (Sunday) to 6 (Saturday).
 #' @param language The language used for month and day names. Default is "en".
-#'   Other valid values include "ar-tn", "ar", "az", "bg", "bn", "br", "bs",
-#'   "ca", "cs", "cy", "da", "de", "el", "en-AU", "en-CA", "en-GB", "en-IE",
-#'   "en-NZ", "en-ZA", "eo", "es", "et", "eu", "fa", "fi", "fo", "fr-CH", "fr",
-#'   "gl", "he", "hi", "hr", "hu", "hy", "id", "is", "it-CH", "it", "ja", "ka",
-#'   "kh", "kk", "km", "ko", "kr", "lt", "lv", "me", "mk", "mn", "ms", "nl-BE",
-#'   "nl", "no", "oc", "pl", "pt-BR", "pt", "ro", "rs-latin", "rs", "ru", "si",
-#'   "sk", "sl", "sq", "sr-latin", "sr", "sv", "sw", "ta", "tg", "th", "tk",
-#'   "tr", "uk", "uz-cyrl", "uz-latn", "vi", "zh-CN", and "zh-TW".
-#' @param autoclose Whether or not to close the datepicker immediately when a
-#'   date is selected.
-#' @param datesdisabled Which dates should be disabled. Either a Date object, or
-#'   a string in \code{yyyy-mm-dd} format.
-#' @param daysofweekdisabled Days of the week that should be disabled. Should be
-#'   a integer vector with values from 0 (Sunday) to 6 (Saturday).
+#'   Other valid values include "ar", "az", "bg", "bs", "ca", "cs", "cy", "da",
+#'   "de", "el", "en-AU", "en-GB", "eo", "es", "et", "eu", "fa", "fi", "fo",
+#'   "fr-CH", "fr", "gl", "he", "hr", "hu", "hy", "id", "is", "it-CH", "it",
+#'   "ja", "ka", "kh", "kk", "ko", "kr", "lt", "lv", "me", "mk", "mn", "ms",
+#'   "nb", "nl-BE", "nl", "no", "pl", "pt-BR", "pt", "ro", "rs-latin", "rs",
+#'   "ru", "sk", "sl", "sq", "sr-latin", "sr", "sv", "sw", "th", "tr", "uk",
+#'   "vi", "zh-CN", and "zh-TW".
 #'
 #' @family input elements
 #' @seealso \code{\link{dateRangeInput}}, \code{\link{updateDateInput}}
@@ -75,32 +68,21 @@
 #'
 #'   # Start with decade view instead of default month view
 #'   dateInput("date6", "Date:",
-#'             startview = "decade"),
-#'
-#'   # Disable Mondays and Tuesdays.
-#'   dateInput("date7", "Date:", daysofweekdisabled = c(1,2)),
-#'
-#'   # Disable specific dates.
-#'   dateInput("date8", "Date:", value = "2012-02-29",
-#'             datesdisabled = c("2012-03-01", "2012-03-02"))
+#'             startview = "decade")
 #' )
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
 #' @export
 dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
-  format = "yyyy-mm-dd", startview = "month", weekstart = 0,
-  language = "en", width = NULL, autoclose = TRUE,
-  datesdisabled = NULL, daysofweekdisabled = NULL) {
+  format = "yyyy-mm-dd", startview = "month", weekstart = 0, language = "en",
+  width = NULL) {
 
   # If value is a date object, convert it to a string with yyyy-mm-dd format
   # Same for min and max
   if (inherits(value, "Date"))  value <- format(value, "%Y-%m-%d")
   if (inherits(min,   "Date"))  min   <- format(min,   "%Y-%m-%d")
   if (inherits(max,   "Date"))  max   <- format(max,   "%Y-%m-%d")
-  if (inherits(datesdisabled, "Date")) {
-      datesdisabled <- format(datesdisabled,   "%Y-%m-%d")
-  }
 
   value <- restoreInput(id = inputId, default = value)
 
@@ -117,22 +99,14 @@ dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
                `data-date-start-view` = startview,
                `data-min-date` = min,
                `data-max-date` = max,
-               `data-initial-date` = value,
-               `data-date-autoclose` = if (autoclose) "true" else "false",
-               `data-date-dates-disabled` =
-                   # Ensure NULL is not sent as `{}` but as 'null'
-                   jsonlite::toJSON(datesdisabled, null = 'null'),
-               `data-date-days-of-week-disabled` =
-                   jsonlite::toJSON(daysofweekdisabled, null = 'null')
+               `data-initial-date` = value
     ),
     datePickerDependency
   )
 }
 
 datePickerDependency <- htmlDependency(
-  "bootstrap-datepicker",
-  "1.8.0",
-  c(href = "shared/datepicker"),
+  "bootstrap-datepicker", "1.6.4", c(href = "shared/datepicker"),
   script = "js/bootstrap-datepicker.min.js",
   stylesheet = "css/bootstrap-datepicker3.min.css",
   # Need to enable noConflict mode. See #1346.

R/input-daterange.R

@@ -73,8 +73,7 @@
 #' @export
 dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
     min = NULL, max = NULL, format = "yyyy-mm-dd", startview = "month",
-    weekstart = 0, language = "en", separator = " to ", width = NULL,
-    autoclose = TRUE) {
+    weekstart = 0, language = "en", separator = " to ", width = NULL) {
 
   # If start and end are date objects, convert to a string with yyyy-mm-dd format
   # Same for min and max
@@ -104,8 +103,7 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
           `data-date-start-view` = startview,
           `data-min-date` = min,
           `data-max-date` = max,
-          `data-initial-date` = start,
-          `data-date-autoclose` = if (autoclose) "true" else "false"
+          `data-initial-date` = start
         ),
         span(class = "input-group-addon", separator),
         tags$input(
@@ -117,8 +115,7 @@ dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
           `data-date-start-view` = startview,
           `data-min-date` = min,
           `data-max-date` = max,
-          `data-initial-date` = end,
-          `data-date-autoclose` = if (autoclose) "true" else "false"
+          `data-initial-date` = end
         )
       )
     ),

R/input-select.R

@@ -33,7 +33,7 @@
 #' @return A select list control that can be added to a UI definition.
 #'
 #' @family input elements
-#' @seealso \code{\link{updateSelectInput}} \code{\link{varSelectInput}}
+#' @seealso \code{\link{updateSelectInput}}
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -59,9 +59,9 @@
 #' shinyApp(
 #'   ui = fluidPage(
 #'     selectInput("state", "Choose a state:",
-#'       list(`East Coast` = list("NY", "NJ", "CT"),
-#'            `West Coast` = list("WA", "OR", "CA"),
-#'            `Midwest` = list("MN", "WI", "IA"))
+#'       list(`East Coast` = c("NY", "NJ", "CT"),
+#'            `West Coast` = c("WA", "OR", "CA"),
+#'            `Midwest` = c("MN", "WI", "IA"))
 #'     ),
 #'     textOutput("result")
 #'   ),
@@ -212,135 +212,3 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 
   attachDependencies(select, selectizeDep)
 }
-
-
-
-
-
-
-
-
-#' Select variables from a data frame
-#'
-#' Create a select list that can be used to choose a single or multiple items
-#' from the column names of a data frame.
-#'
-#' The resulting server \code{input} value will be returned as:
-#' \itemize{
-#'   \item a symbol if \code{multiple = FALSE}.  The \code{input} value should be
-#'         used with rlang's \code{\link[rlang]{!!}}. For example,
-#'         \code{ggplot2::aes(!!input$variable)}.
-#'   \item a list of symbols if \code{multiple = TRUE}. The \code{input} value
-#'         should be used with rlang's \code{\link[rlang]{!!!}} to expand
-#'         the symbol list as individual arguments. For example,
-#'         \code{dplyr::select(mtcars, !!!input$variabls)} which is
-#'         equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
-#' }
-#'
-#' By default, \code{varSelectInput()} and \code{selectizeInput()} use the
-#' JavaScript library \pkg{selectize.js}
-#' (\url{https://github.com/selectize/selectize.js}) to instead of the basic
-#' select input element. To use the standard HTML select input element, use
-#' \code{selectInput()} with \code{selectize=FALSE}.
-#'
-#' @inheritParams selectInput
-#' @param data A data frame. Used to retrieve the column names as choices for a \code{\link{selectInput}}
-#' @return A variable select list control that can be added to a UI definition.
-#'
-#' @family input elements
-#' @seealso \code{\link{updateSelectInput}}
-#' @examples
-#'
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' library(ggplot2)
-#'
-#' # single selection
-#' shinyApp(
-#'   ui = fluidPage(
-#'     varSelectInput("variable", "Variable:", mtcars),
-#'     plotOutput("data")
-#'   ),
-#'   server = function(input, output) {
-#'     output$data <- renderPlot({
-#'       ggplot(mtcars, aes(!!input$variable)) + geom_histogram()
-#'     })
-#'   }
-#' )
-#'
-#'
-#' # multiple selections
-#' \dontrun{
-#' shinyApp(
-#'  ui = fluidPage(
-#'    varSelectInput("variables", "Variable:", mtcars, multiple = TRUE),
-#'    tableOutput("data")
-#'  ),
-#'  server = function(input, output) {
-#'    output$data <- renderTable({
-#'       if (length(input$variables) == 0) return(mtcars)
-#'       mtcars %>% dplyr::select(!!!input$variables)
-#'    }, rownames = TRUE)
-#'  }
-#' )}
-#'
-#' }
-#' @export
-varSelectInput <- function(
-  inputId, label, data, selected = NULL,
-  multiple = FALSE, selectize = TRUE, width = NULL,
-  size = NULL
-) {
-  # no place holders
-  choices <- colnames(data)
-
-  selectInputVal <- selectInput(
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected,
-    multiple = multiple,
-    selectize = selectize,
-    width = width,
-    size = size
-  )
-
-  # set the select tag class to be "symbol"
-  selectClass <- selectInputVal$children[[2]]$children[[1]]$attribs$class
-  if (is.null(selectClass)) {
-    newClass <- "symbol"
-  } else {
-    newClass <- paste(selectClass, "symbol", sep = " ")
-  }
-  selectInputVal$children[[2]]$children[[1]]$attribs$class <- newClass
-
-  selectInputVal
-}
-
-
-
-#' @rdname varSelectInput
-#' @param ... Arguments passed to \code{varSelectInput()}.
-#' @param options A list of options. See the documentation of \pkg{selectize.js}
-#'   for possible options (character option values inside \code{\link[base]{I}()} will
-#'   be treated as literal JavaScript code; see \code{\link{renderDataTable}()}
-#'   for details).
-#' @param width The width of the input, e.g. \code{'400px'}, or \code{'100\%'};
-#'   see \code{\link{validateCssUnit}}.
-#' @note The variable selectize input created from \code{varSelectizeInput()} allows
-#'   deletion of the selected option even in a single select input, which will
-#'   return an empty string as its value. This is the default behavior of
-#'   \pkg{selectize.js}. However, the selectize input created from
-#'   \code{selectInput(..., selectize = TRUE)} will ignore the empty string
-#'   value when it is a single choice input and the empty string is not in the
-#'   \code{choices} argument. This is to keep compatibility with
-#'   \code{selectInput(..., selectize = FALSE)}.
-#' @export
-varSelectizeInput <- function(inputId, ..., options = NULL, width = NULL) {
-  selectizeIt(
-    inputId,
-    varSelectInput(inputId, ..., selectize = FALSE, width = width),
-    options
-  )
-}

R/input-slider.R

@@ -86,10 +86,24 @@ sliderInput <- function(inputId, label, min, max, value, step = NULL,
                     version = "0.10.2.2")
   }
 
-  dataType <- getSliderType(min, max, value)
+  if (inherits(min, "Date")) {
+    if (!inherits(max, "Date") || !inherits(value, "Date"))
+      stop("`min`, `max`, and `value must all be Date or non-Date objects")
+    dataType <- "date"
 
-  if (is.null(timeFormat)) {
-    timeFormat <- switch(dataType, date = "%F", datetime = "%F %T", number = NULL)
+    if (is.null(timeFormat))
+      timeFormat <- "%F"
+
+  } else if (inherits(min, "POSIXt")) {
+    if (!inherits(max, "POSIXt") || !inherits(value, "POSIXt"))
+      stop("`min`, `max`, and `value must all be POSIXt or non-POSIXt objects")
+    dataType <- "datetime"
+
+    if (is.null(timeFormat))
+      timeFormat <- "%F %T"
+
+  } else {
+    dataType <- "number"
   }
 
   # Restore bookmarked values here, after doing the type checking, because the
@@ -236,13 +250,7 @@ findStepSize <- function(min, max, step) {
     # values to calculate the step size.
     pretty_steps <- pretty(c(min, max), n = 100)
     n_steps <- length(pretty_steps) - 1
-
-    # Fix for #2061: Windows has low-significance digits (like 17 digits out)
-    # even at the boundaries of pretty()'s output. Use signif(digits = 10),
-    # which should be way way less significant than any data we'd want to keep.
-    # It might make sense to use signif(steps[2] - steps[1], 10) instead, but
-    # for now trying to make the minimal change.
-    signif(digits = 10, (max(pretty_steps) - min(pretty_steps)) / n_steps)
+    (max(pretty_steps) - min(pretty_steps)) / n_steps
 
   } else {
     1

R/react.R

@@ -43,9 +43,7 @@ Context <- R6Class(
         withReactiveDomain(.domain, {
           env <- .getReactiveEnvironment()
           .graphEnterContext(id)
-          on.exit({
-            .graphExitContext(id, domain = .domain)
-          }, add = TRUE)
+          on.exit(.graphExitContext(id), add = TRUE)
           env$runWith(self, func)
         })
       })

R/reactive-domains.R

@@ -95,7 +95,11 @@ getDefaultReactiveDomain <- function() {
 #' @rdname domains
 #' @export
 withReactiveDomain <- function(domain, expr) {
-  promises::with_promise_domain(createVarPromiseDomain(.globals, "domain", domain), expr)
+  oldValue <- .globals$domain
+  .globals$domain <- domain
+  on.exit(.globals$domain <- oldValue)
+
+  expr
 }
 
 #

R/reactives.R

@@ -278,9 +278,8 @@ ReactiveValues <- R6Class(
     .allValuesDeps = 'Dependents',
     # Dependents for all values
     .valuesDeps = 'Dependents',
-    .dedupe = logical(0),
 
-    initialize = function(dedupe = TRUE) {
+    initialize = function() {
       .label <<- paste('reactiveValues',
                        p_randomInt(1000, 10000),
                        sep="")
@@ -290,7 +289,6 @@ ReactiveValues <- R6Class(
       .namesDeps <<- Dependents$new()
       .allValuesDeps <<- Dependents$new()
       .valuesDeps <<- Dependents$new()
-      .dedupe <<- dedupe
     },
 
     get = function(key) {
@@ -319,7 +317,7 @@ ReactiveValues <- R6Class(
       hidden <- substr(key, 1, 1) == "."
 
       if (exists(key, envir=.values, inherits=FALSE)) {
-        if (.dedupe && identical(.values[[key]], value)) {
+        if (identical(.values[[key]], value)) {
           return(invisible())
         }
       }
@@ -783,6 +781,18 @@ Observable <- R6Class(
             # If an error occurs, we want to propagate the error, but we also
             # want to save a copy of it, so future callers of this reactive will
             # get the same error (i.e. the error is cached).
+
+            # We stripStackTrace in the next line, just in case someone
+            # downstream of us (i.e. deeper into the call stack) used
+            # captureStackTraces; otherwise the entire stack would always be the
+            # same (i.e. you'd always see the whole stack trace of the *first*
+            # time the code was run and the condition raised; there'd be no way
+            # to see the stack trace of the call site that caused the cached
+            # exception to be re-raised, and you need that information to figure
+            # out what's triggering the re-raise).
+            #
+            # We use try(stop()) as an easy way to generate a try-error object
+            # out of this condition.
             .value <<- cond
             .error <<- TRUE
             .visible <<- FALSE
@@ -959,12 +969,19 @@ Observer <- R6Class(
       if (length(formals(observerFunc)) > 0)
         stop("Can't make an observer from a function that takes parameters; ",
              "only functions without parameters can be reactive.")
-      if (grepl("\\s", label, perl = TRUE)) {
-        funcLabel <- "<observer>"
-      } else {
-        funcLabel <- paste0("<observer:", label, ">")
+registerDebugHook("observerFunc", environment(), label)
+      .func <<- function() {
+        tryCatch(
+          if (..stacktraceon)
+            ..stacktraceon..(observerFunc())
+          else
+            observerFunc(),
+          # It's OK for shiny.silent.error errors to cause an observer to stop running
+          shiny.silent.error = function(e) NULL
+          # validation = function(e) NULL,
+          # shiny.output.cancel = function(e) NULL
+        )
       }
-      .func <<- wrapFunctionLabel(observerFunc, funcLabel, ..stacktraceon = ..stacktraceon)
       .label <<- label
       .domain <<- domain
       .priority <<- normalizePriority(priority)
@@ -1029,15 +1046,6 @@ Observer <- R6Class(
             }
           },
           catch = function(e) {
-            # It's OK for shiny.silent.error errors to cause an observer to stop running
-            # shiny.silent.error = function(e) NULL
-            # validation = function(e) NULL,
-            # shiny.output.cancel = function(e) NULL
-
-            if (inherits(e, "shiny.silent.error")) {
-              return()
-            }
-
             printError(e)
             if (!is.null(.domain)) {
               .domain$unhandledError(e)
@@ -1394,28 +1402,20 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
   force(session)
 
   dependents <- Map$new()
-  timerHandle <- scheduleTask(intervalMs, function() {
+  timerCallbacks$schedule(intervalMs, function() {
     # Quit if the session is closed
     if (!is.null(session) && session$isClosed()) {
       return(invisible())
     }
 
-    timerHandle <<- scheduleTask(intervalMs, sys.function())
-
-    session$cycleStartAction(function() {
-      lapply(
-        dependents$values(),
-        function(dep.ctx) {
-          dep.ctx$invalidate()
-          NULL
-        })
-    })
+    timerCallbacks$schedule(intervalMs, sys.function())
+    lapply(
+      dependents$values(),
+      function(dep.ctx) {
+        dep.ctx$invalidate()
+        NULL
+      })
   })
-
-  if (!is.null(session)) {
-    session$onEnded(timerHandle)
-  }
-
   return(function() {
     ctx <- .getReactiveEnvironment()$currentContext()
     if (!dependents$containsKey(ctx$id)) {
@@ -1485,7 +1485,7 @@ reactiveTimer <- function(intervalMs=1000, session = getDefaultReactiveDomain())
 invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
   force(session)
   ctx <- .getReactiveEnvironment()$currentContext()
-  timerHandle <- scheduleTask(millis, function() {
+  timerCallbacks$schedule(millis, function() {
     if (is.null(session)) {
       ctx$invalidate()
       return(invisible())
@@ -1499,11 +1499,6 @@ invalidateLater <- function(millis, session = getDefaultReactiveDomain()) {
 
     invisible()
   })
-
-  if (!is.null(session)) {
-    session$onEnded(timerHandle)
-  }
-
   invisible()
 }
 
@@ -1821,20 +1816,15 @@ maskReactiveContext <- function(expr) {
 #' the action/calculation and just let the user re-initiate it (like a
 #' "Recalculate" button).
 #'
-#' Likewise, both \code{observeEvent} and \code{eventReactive} also take in an
-#' \code{ignoreInit} argument. By default, both of these will run right when they
-#' are created (except if, at that moment, \code{eventExpr} evaluates to \code{NULL}
+#' Unlike what happens for \code{ignoreNULL}, only \code{observeEvent} takes in an
+#' \code{ignoreInit} argument. By default, \code{observeEvent} will run right when
+#' it is created (except if, at that moment, \code{eventExpr} evaluates to \code{NULL}
 #' and \code{ignoreNULL} is \code{TRUE}). But when responding to a click of an action
 #' button, it may often be useful to set \code{ignoreInit} to \code{TRUE}. For
 #' example, if you're setting up an \code{observeEvent} for a dynamically created
 #' button, then \code{ignoreInit = TRUE} will guarantee that the action (in
 #' \code{handlerExpr}) will only be triggered when the button is actually clicked,
-#' instead of also being triggered when it is created/initialized. Similarly,
-#' if you're setting up an \code{eventReactive} that responds to a dynamically
-#' created button used to refresh some data (then returned by that \code{eventReactive}),
-#' then you should use \code{eventReactive([...], ignoreInit = TRUE)} if you want
-#' to let the user decide if/when they want to refresh the data (since, depending
-#' on the app, this may be a computationally expensive operation).
+#' instead of also being triggered when it is created/initialized.
 #'
 #' Even though \code{ignoreNULL} and \code{ignoreInit} can be used for similar
 #' purposes they are independent from one another. Here's the result of combining
@@ -1842,28 +1832,25 @@ maskReactiveContext <- function(expr) {
 #'
 #' \describe{
 #'   \item{\code{ignoreNULL = TRUE} and \code{ignoreInit = FALSE}}{
-#'      This is the default. This combination means that \code{handlerExpr}/
-#'      \code{valueExpr} will run every time that \code{eventExpr} is not
-#'      \code{NULL}. If, at the time of the creation of the
-#'      \code{observeEvent}/\code{eventReactive}, \code{eventExpr} happens
-#'      to \emph{not} be \code{NULL}, then the code runs.
+#'      This is the default. This combination means that \code{handlerExpr} will
+#'      run every time that \code{eventExpr} is not \code{NULL}. If, at the time
+#'      of the \code{observeEvent}'s creation, \code{handleExpr} happens to
+#'      \emph{not} be \code{NULL}, then the code runs.
 #'   }
 #'   \item{\code{ignoreNULL = FALSE} and \code{ignoreInit = FALSE}}{
-#'      This combination means that \code{handlerExpr}/\code{valueExpr} will
-#'      run every time no matter what.
+#'      This combination means that \code{handlerExpr} will run every time no
+#'      matter what.
 #'   }
 #'   \item{\code{ignoreNULL = FALSE} and \code{ignoreInit = TRUE}}{
-#'      This combination means that \code{handlerExpr}/\code{valueExpr} will
-#'      \emph{not} run when the \code{observeEvent}/\code{eventReactive} is
-#'      created (because \code{ignoreInit = TRUE}), but it will run every
-#'      other time.
+#'      This combination means that \code{handlerExpr} will \emph{not} run when
+#'      the \code{observeEvent} is created (because \code{ignoreInit = TRUE}),
+#'      but it will run every other time.
 #'   }
 #'   \item{\code{ignoreNULL = TRUE} and \code{ignoreInit = TRUE}}{
-#'      This combination means that \code{handlerExpr}/\code{valueExpr} will
-#'      \emph{not} run when the \code{observeEvent}/\code{eventReactive} is
-#'      created (because  \code{ignoreInit = TRUE}). After that,
-#'      \code{handlerExpr}/\code{valueExpr} will run every time that
-#'      \code{eventExpr} is not \code{NULL}.
+#'      This combination means that \code{handlerExpr} will \emph{not} run when
+#'      the \code{observeEvent} is created (because \code{ignoreInit = TRUE}).
+#'      After that, \code{handlerExpr} will run every time that \code{eventExpr}
+#'      is not \code{NULL}.
 #'   }
 #' }
 #'
@@ -2003,25 +1990,22 @@ observeEvent <- function(eventExpr, handlerExpr,
   initialized <- FALSE
 
   o <- observe({
-    hybrid_chain(
-      {eventFunc()},
-      function(value) {
-        if (ignoreInit && !initialized) {
-          initialized <<- TRUE
-          return()
-        }
+    e <- eventFunc()
 
-        if (ignoreNULL && isNullEvent(value)) {
-          return()
-        }
+    if (ignoreInit && !initialized) {
+      initialized <<- TRUE
+      return()
+    }
 
-        if (once) {
-          on.exit(o$destroy())
-        }
+    if (ignoreNULL && isNullEvent(e)) {
+      return()
+    }
 
-        isolate(handlerFunc())
-      }
-    )
+    if (once) {
+      on.exit(o$destroy())
+    }
+
+    isolate(handlerFunc())
   }, label = label, suspended = suspended, priority = priority, domain = domain,
   autoDestroy = TRUE, ..stacktraceon = FALSE)
 
@@ -2047,19 +2031,16 @@ eventReactive <- function(eventExpr, valueExpr,
   initialized <- FALSE
 
   invisible(reactive({
-    hybrid_chain(
-      eventFunc(),
-      function(value) {
-        if (ignoreInit && !initialized) {
-          initialized <<- TRUE
-          req(FALSE)
-        }
+    e <- eventFunc()
 
-        req(!ignoreNULL || !isNullEvent(value))
+    if (ignoreInit && !initialized) {
+      initialized <<- TRUE
+      req(FALSE)
+    }
 
-        isolate(handlerFunc())
-      }
-    )
+    req(!ignoreNULL || !isNullEvent(e))
+
+    isolate(handlerFunc())
   }, label = label, domain = domain, ..stacktraceon = FALSE))
 }
 

R/render-cached-plot.R

@@ -1,588 +0,0 @@
-#' Plot output with cached images
-#'
-#' Renders a reactive plot, with plot images cached to disk.
-#'
-#' \code{expr} is an expression that generates a plot, similar to that in
-#' \code{renderPlot}. Unlike with \code{renderPlot}, this expression does not
-#' take reactive dependencies. It is re-executed only when the cache key
-#' changes.
-#'
-#' \code{cacheKeyExpr} is an expression which, when evaluated, returns an object
-#' which will be serialized and hashed using the \code{\link[digest]{digest}}
-#' function to generate a string that will be used as a cache key. This key is
-#' used to identify the contents of the plot: if the cache key is the same as a
-#' previous time, it assumes that the plot is the same and can be retrieved from
-#' the cache.
-#'
-#' This \code{cacheKeyExpr} is reactive, and so it will be re-evaluated when any
-#' upstream reactives are invalidated. This will also trigger re-execution of
-#' the plotting expression, \code{expr}.
-#'
-#' The key should consist of "normal" R objects, like vectors and lists. Lists
-#' should in turn contain other normal R objects. If the key contains
-#' environments, external pointers, or reference objects -- or even if it has
-#' such objects attached as attributes -- then it is possible that it will
-#' change unpredictably even when you do not expect it to. Additionally, because
-#' the entire key is serialized and hashed, if it contains a very large object
-#' -- a large data set, for example -- there may be a noticeable performance
-#' penalty.
-#'
-#' If you face these issues with the cache key, you can work around them by
-#' extracting out the important parts of the objects, and/or by converting them
-#' to normal R objects before returning them. Your expression could even
-#' serialize and hash that information in an efficient way and return a string,
-#' which will in turn be hashed (very quickly) by the
-#' \code{\link[digest]{digest}} function.
-#'
-#' Internally, the result from \code{cacheKeyExpr} is combined with the name of
-#' the output (if you assign it to \code{output$plot1}, it will be combined
-#' with \code{"plot1"}) to form the actual key that is used. As a result, even
-#' if there are multiple plots that have the same \code{cacheKeyExpr}, they
-#' will not have cache key collisions.
-#'
-#' @section Cache scoping:
-#'
-#'   There are a number of different ways you may want to scope the cache. For
-#'   example, you may want each user session to have their own plot cache, or
-#'   you may want each run of the application to have a cache (shared among
-#'   possibly multiple simultaneous user sessions), or you may want to have a
-#'   cache that persists even after the application is shut down and started
-#'   again.
-#'
-#'   To control the scope of the cache, use the \code{cache} parameter. There
-#'   are two ways of having Shiny automatically create and clean up the disk
-#'   cache.
-#'
-#' \describe{
-#'   \item{1}{To scope the cache to one run of a Shiny application (shared
-#'     among possibly multiple user sessions), use \code{cache="app"}. This
-#'     is the default. The cache will be shared across multiple sessions, so
-#'     there is potentially a large performance benefit if there are many users
-#'     of the application. When the application stops running, the cache will
-#'     be deleted. If plots cannot be safely shared across users, this should
-#'     not be used.}
-#'   \item{2}{To scope the cache to one session, use \code{cache="session"}.
-#'     When a new user session starts -- in other words, when a web browser
-#'     visits the Shiny application -- a new cache will be created on disk
-#'     for that session. When the session ends, the cache will be deleted.
-#'     The cache will not be shared across multiple sessions.}
-#'  }
-#'
-#'   If either \code{"app"} or \code{"session"} is used, the cache will be 10 MB
-#'   in size, and will be stored stored in memory, using a
-#'   \code{\link{memoryCache}} object. Note that the cache space will be shared
-#'   among all cached plots within a single application or session.
-#'
-#'   In some cases, you may want more control over the caching behavior. For
-#'   example, you may want to use a larger or smaller cache, share a cache
-#'   among multiple R processes, or you may want the cache to persist across
-#'   multiple runs of an application, or even across multiple R processes.
-#'
-#'   To use different settings for an application-scoped cache, you can call
-#'   \code{\link{shinyOptions}()} at the top of your app.R, server.R, or
-#'   global.R. For example, this will create a cache with 20 MB of space
-#'   instead of the default 10 MB:
-#'   \preformatted{
-#'   shinyOptions(cache = memoryCache(size = 20e6))
-#'   }
-#'
-#'   To use different settings for a session-scoped cache, you can call
-#'   \code{\link{shinyOptions}()} at the top of your server function. To use
-#'   the session-scoped cache, you must also call \code{renderCachedPlot} with
-#'   \code{cache="session"}. This will create a 20 MB cache for the session:
-#'   \preformatted{
-#'   function(input, output, session) {
-#'     shinyOptions(cache = memoryCache(size = 20e6))
-#'
-#'     output$plot <- renderCachedPlot(
-#'       ...,
-#'       cache = "session"
-#'     )
-#'   }
-#'   }
-#'
-#'   If you want to create a cache that is shared across multiple concurrent
-#'   R processes, you can use a \code{\link{diskCache}}. You can create an
-#'   application-level shared cache by putting this at the top of your app.R,
-#'   server.R, or global.R:
-#'   \preformatted{
-#'   shinyOptions(cache = diskCache(file.path(dirname(tempdir()), "myapp-cache"))
-#'   }
-#'
-#'   This will create a subdirectory in your system temp directory named
-#'   \code{myapp-cache} (replace \code{myapp-cache} with a unique name of
-#'   your choosing). On most platforms, this directory will be removed when
-#'   your system reboots. This cache will persist across multiple starts and
-#'   stops of the R process, as long as you do not reboot.
-#'
-#'   To have the cache persist even across multiple reboots, you can create the
-#'   cache in a location outside of the temp directory. For example, it could
-#'   be a subdirectory of the application:
-#'   \preformatted{
-#'   shinyOptions(cache = diskCache("./myapp-cache"))
-#'   }
-#'
-#'   In this case, resetting the cache will have to be done manually, by deleting
-#'   the directory.
-#'
-#'   You can also scope a cache to just one plot, or selected plots. To do that,
-#'   create a \code{\link{memoryCache}} or \code{\link{diskCache}}, and pass it
-#'   as the \code{cache} argument of \code{renderCachedPlot}.
-#'
-#' @section Interactive plots:
-#'
-#'   \code{renderCachedPlot} can be used to create interactive plots. See
-#'   \code{\link{plotOutput}} for more information and examples.
-#'
-#'
-#' @inheritParams renderPlot
-#' @param cacheKeyExpr An expression that returns a cache key. This key should
-#'   be a unique identifier for a plot: the assumption is that if the cache key
-#'   is the same, then the plot will be the same.
-#' @param sizePolicy A function that takes two arguments, \code{width} and
-#'   \code{height}, and returns a list with \code{width} and \code{height}. The
-#'   purpose is to round the actual pixel dimensions from the browser to some
-#'   other dimensions, so that this will not generate and cache images of every
-#'   possible pixel dimension. See \code{\link{sizeGrowthRatio}} for more
-#'   information on the default sizing policy.
-#' @param res The resolution of the PNG, in pixels per inch.
-#' @param cache The scope of the cache, or a cache object. This can be
-#'   \code{"app"} (the default), \code{"session"}, or a cache object like
-#'   a \code{\link{diskCache}}. See the Cache Scoping section for more
-#'   information.
-#'
-#' @seealso See \code{\link{renderPlot}} for the regular, non-cached version of
-#'   this function. For more about configuring caches, see
-#'   \code{\link{memoryCache}} and \code{\link{diskCache}}.
-#'
-#'
-#' @examples
-#' ## Only run examples in interactive R sessions
-#' if (interactive()) {
-#'
-#' # A basic example that uses the default app-scoped memory cache.
-#' # The cache will be shared among all simultaneous users of the application.
-#' shinyApp(
-#'   fluidPage(
-#'     sidebarLayout(
-#'       sidebarPanel(
-#'         sliderInput("n", "Number of points", 4, 32, value = 8, step = 4)
-#'       ),
-#'       mainPanel(plotOutput("plot"))
-#'     )
-#'   ),
-#'   function(input, output, session) {
-#'     output$plot <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) }
-#'     )
-#'   }
-#' )
-#'
-#'
-#'
-#' # An example uses a data object shared across sessions. mydata() is part of
-#' # the cache key, so when its value changes, plots that were previously
-#' # stored in the cache will no longer be used (unless mydata() changes back
-#' # to its previous value).
-#' mydata <- reactiveVal(data.frame(x = rnorm(400), y = rnorm(400)))
-#'
-#' ui <- fluidPage(
-#'   sidebarLayout(
-#'     sidebarPanel(
-#'       sliderInput("n", "Number of points", 50, 400, 100, step = 50),
-#'       actionButton("newdata", "New data")
-#'     ),
-#'     mainPanel(
-#'       plotOutput("plot")
-#'     )
-#'   )
-#' )
-#'
-#' server <- function(input, output, session) {
-#'   observeEvent(input$newdata, {
-#'     mydata(data.frame(x = rnorm(400), y = rnorm(400)))
-#'   })
-#'
-#'   output$plot <- renderCachedPlot(
-#'     {
-#'       Sys.sleep(2)
-#'       d <- mydata()
-#'       seqn <- seq_len(input$n)
-#'       plot(d$x[seqn], d$y[seqn], xlim = range(d$x), ylim = range(d$y))
-#'     },
-#'     cacheKeyExpr = { list(input$n, mydata()) },
-#'   )
-#' }
-#'
-#' shinyApp(ui, server)
-#'
-#'
-#' # A basic application with two plots, where each plot in each session has
-#' # a separate cache.
-#' shinyApp(
-#'   fluidPage(
-#'     sidebarLayout(
-#'       sidebarPanel(
-#'         sliderInput("n", "Number of points", 4, 32, value = 8, step = 4)
-#'       ),
-#'       mainPanel(
-#'         plotOutput("plot1"),
-#'         plotOutput("plot2")
-#'       )
-#'     )
-#'   ),
-#'   function(input, output, session) {
-#'     output$plot1 <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) },
-#'       cache = memoryCache()
-#'     )
-#'     output$plot2 <- renderCachedPlot({
-#'         Sys.sleep(2)  # Add an artificial delay
-#'         seqn <- seq_len(input$n)
-#'         plot(mtcars$wt[seqn], mtcars$mpg[seqn],
-#'              xlim = range(mtcars$wt), ylim = range(mtcars$mpg))
-#'       },
-#'       cacheKeyExpr = { list(input$n) },
-#'       cache = memoryCache()
-#'     )
-#'   }
-#' )
-#'
-#' }
-#'
-#' \dontrun{
-#' # At the top of app.R, this set the application-scoped cache to be a memory
-#' # cache that is 20 MB in size, and where cached objects expire after one
-#' # hour.
-#' shinyOptions(cache = memoryCache(max_size = 20e6, max_age = 3600))
-#'
-#' # At the top of app.R, this set the application-scoped cache to be a disk
-#' # cache that can be shared among multiple concurrent R processes, and is
-#' # deleted when the system reboots.
-#' shinyOptions(cache = diskCache(file.path(dirname(tempdir()), "myapp-cache"))
-#'
-#' # At the top of app.R, this set the application-scoped cache to be a disk
-#' # cache that can be shared among multiple concurrent R processes, and
-#' # persists on disk across reboots.
-#' shinyOptions(cache = diskCache("./myapp-cache"))
-#'
-#' # At the top of the server function, this set the session-scoped cache to be
-#' # a memory cache that is 5 MB in size.
-#' server <- function(input, output, session) {
-#'   shinyOptions(cache = memoryCache(max_size = 5e6))
-#'
-#'   output$plot <- renderCachedPlot(
-#'     ...,
-#'     cache = "session"
-#'   )
-#' }
-#'
-#' }
-#' @export
-renderCachedPlot <- function(expr,
-  cacheKeyExpr,
-  sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2),
-  res = 72,
-  cache = "app",
-  ...,
-  outputArgs = list()
-) {
-
-  # This ..stacktraceon is matched by a ..stacktraceoff.. when plotFunc
-  # is called
-  installExprFunction(expr, "func", parent.frame(), quoted = FALSE, ..stacktraceon = TRUE)
-  # This is so that the expr doesn't re-execute by itself; it needs to be
-  # triggered by the cache key (or width/height) changing.
-  isolatedFunc <- function() isolate(func())
-
-  args <- list(...)
-
-  cacheKeyExpr <- substitute(cacheKeyExpr)
-  # The real cache key we'll use also includes width, height, res, pixelratio.
-  # This is just the part supplied by the user.
-  userCacheKey <- reactive(cacheKeyExpr, env = parent.frame(), quoted = TRUE, label = "userCacheKey")
-
-  ensureCacheSetup <- function() {
-    # For our purposes, cache objects must support these methods.
-    isCacheObject <- function(x) {
-      # Use tryCatch in case the object does not support `$`.
-      tryCatch(
-        is.function(x$get) && is.function(x$set),
-        error = function(e) FALSE
-      )
-    }
-
-    if (isCacheObject(cache)) {
-      # If `cache` is already a cache object, do nothing
-      return()
-
-    } else if (identical(cache, "app")) {
-      cache <<- getShinyOption("cache")
-
-    } else if (identical(cache, "session")) {
-      cache <<- session$cache
-
-    } else {
-      stop('`cache` must either be "app", "session", or a cache object with methods, `$get`, and `$set`.')
-    }
-  }
-
-  # The width and height of the plot to draw, given from sizePolicy. These
-  # values get filled by an observer below.
-  fitDims <- reactiveValues(width = NULL, height = NULL)
-
-  resizeObserver <- NULL
-  ensureResizeObserver <- function() {
-    if (!is.null(resizeObserver))
-      return()
-
-    # Given the actual width/height of the image in the browser, this gets the
-    # width/height from sizePolicy() and pushes those values into `fitDims`.
-    # It's done this way so that the `fitDims` only change (and cause
-    # invalidations) when the rendered image size changes, and not every time
-    # the browser's <img> tag changes size.
-    doResizeCheck <- function() {
-      width  <- session$clientData[[paste0('output_', outputName, '_width')]]
-      height <- session$clientData[[paste0('output_', outputName, '_height')]]
-
-      if (is.null(width)) width <- 0
-      if (is.null(height)) height <- 0
-
-      rect <- sizePolicy(c(width, height))
-      fitDims$width  <- rect[1]
-      fitDims$height <- rect[2]
-    }
-
-    # Run it once immediately, then set up the observer
-    isolate(doResizeCheck())
-
-    resizeObserver <<- observe(doResizeCheck())
-  }
-
-  # Vars to store session and output, so that they can be accessed from
-  # the plotObj() reactive.
-  session <- NULL
-  outputName <- NULL
-
-
-  drawReactive <- reactive(label = "plotObj", {
-    hybrid_chain(
-      # Depend on the user cache key, even though we don't use the value. When
-      # it changes, it can cause the drawReactive to re-execute. (Though
-      # drawReactive will not necessarily re-execute -- it must be called from
-      # renderFunc, which happens only if there's a cache miss.)
-      userCacheKey(),
-      function(userCacheKeyValue) {
-        # Get width/height, but don't depend on them.
-        isolate({
-          width  <- fitDims$width
-          height <- fitDims$height
-        })
-
-        pixelratio <- session$clientData$pixelratio %OR% 1
-
-        do.call("drawPlot", c(
-          list(
-            name = outputName,
-            session = session,
-            func = isolatedFunc,
-            width = width,
-            height = height,
-            pixelratio = pixelratio,
-            res = res
-          ),
-          args
-        ))
-      },
-      catch = function(reason) {
-        # Non-isolating read. A common reason for errors in plotting is because
-        # the dimensions are too small. By taking a dependency on width/height,
-        # we can try again if the plot output element changes size.
-        fitDims$width
-        fitDims$height
-
-        # Propagate the error
-        stop(reason)
-      }
-    )
-  })
-
-
-  # This function is the one that's returned from renderPlot(), and gets
-  # wrapped in an observer when the output value is assigned.
-  renderFunc <- function(shinysession, name, ...) {
-    outputName <<- name
-    session <<- shinysession
-    ensureCacheSetup()
-    ensureResizeObserver()
-
-    hybrid_chain(
-      # This use of the userCacheKey() sets up the reactive dependency that
-      # causes plot re-draw events. These may involve pulling from the cache,
-      # replaying a display list, or re-executing user code.
-      userCacheKey(),
-      function(userCacheKeyResult) {
-        width  <- fitDims$width
-        height <- fitDims$height
-        pixelratio <- session$clientData$pixelratio %OR% 1
-
-        key <- digest::digest(list(outputName, userCacheKeyResult, width, height, res, pixelratio), "xxhash64")
-
-        plotObj <- cache$get(key)
-
-        # First look in cache.
-        # Case 1. cache hit.
-        if (!is.key_missing(plotObj)) {
-          return(list(
-            cacheHit = TRUE,
-            key = key,
-            plotObj = plotObj,
-            width = width,
-            height = height,
-            pixelratio = pixelratio
-          ))
-        }
-
-        # If not in cache, hybrid_chain call to drawReactive
-        #
-        # Two more possible cases:
-        #   2. drawReactive will re-execute and return a plot that's the
-        #      correct size.
-        #   3. It will not re-execute, but it will return the previous value,
-        #      which is the wrong size. It will include a valid display list
-        #      which can be used by resizeSavedPlot.
-        hybrid_chain(
-          drawReactive(),
-          function(drawReactiveResult) {
-            # Pass along the key for caching in the next stage
-            list(
-              cacheHit = FALSE,
-              key = key,
-              plotObj = drawReactiveResult,
-              width = width,
-              height = height,
-              pixelratio = pixelratio
-            )
-          }
-        )
-      },
-      function(result) {
-        width      <- result$width
-        height     <- result$height
-        pixelratio <- result$pixelratio
-
-        # Three possibilities when we get here:
-        # 1. There was a cache hit. No need to set a value in the cache.
-        # 2. There was a cache miss, and the plotObj is already the correct
-        #    size (because drawReactive re-executed). In this case, we need
-        #    to cache it.
-        # 3. There was a cache miss, and the plotObj was not the corect size.
-        #    In this case, we need to replay the display list, and then cache
-        #    the result.
-        if (!result$cacheHit) {
-          # If the image is already the correct size, this just returns the
-          # object unchanged.
-          result$plotObj <- do.call("resizeSavedPlot", c(
-            list(
-              name,
-              shinysession,
-              result$plotObj,
-              width,
-              height,
-              pixelratio,
-              res
-            ),
-            args
-          ))
-
-          # Save a cached copy of the plotObj. The recorded displaylist for
-          # the plot can't be serialized and restored properly within the same
-          # R session, so we NULL it out before saving. (The image data and
-          # other metadata be saved and restored just fine.) Displaylists can
-          # also be very large (~1.5MB for a basic ggplot), and they would not
-          # be commonly used. Note that displaylist serialization was fixed in
-          # revision 74506 (2e6c669), and should be in R 3.6. A MemoryCache
-          # doesn't need to serialize objects, so it could actually save a
-          # display list, but for the reasons listed previously, it's
-          # generally not worth it.
-          # The plotResult is not the same as the recordedPlot (it is used to
-          # retrieve coordmap information for ggplot2 objects) but it is only
-          # used in conjunction with the recordedPlot, and we'll remove it
-          # because it can be quite large.
-          result$plotObj$plotResult <- NULL
-          result$plotObj$recordedPlot <- NULL
-          cache$set(result$key, result$plotObj)
-        }
-
-        img <- result$plotObj$img
-        # Replace exact pixel dimensions; instead, the max-height and
-        # max-width will be set to 100% from CSS.
-        img$class <- "shiny-scalable"
-        img$width  <- NULL
-        img$height <- NULL
-
-        img
-      }
-    )
-  }
-
-  # If renderPlot isn't going to adapt to the height of the div, then the
-  # div needs to adapt to the height of renderPlot. By default, plotOutput
-  # sets the height to 400px, so to make it adapt we need to override it
-  # with NULL.
-  outputFunc <- plotOutput
-  formals(outputFunc)['height'] <- list(NULL)
-
-  markRenderFunction(outputFunc, renderFunc, outputArgs = outputArgs)
-}
-
-
-#' Create a sizing function that grows at a given ratio
-#'
-#' Returns a function which takes a two-element vector representing an input
-#' width and height, and returns a two-element vector of width and height. The
-#' possible widths are the base width times the growthRate to any integer power.
-#' For example, with a base width of 500 and growth rate of 1.25, the possible
-#' widths include 320, 400, 500, 625, 782, and so on, both smaller and larger.
-#' Sizes are rounded up to the next pixel. Heights are computed the same way as
-#' widths.
-#'
-#' @param width,height Base width and height.
-#' @param growthRate Growth rate multiplier.
-#'
-#' @seealso This is to be used with \code{\link{renderCachedPlot}}.
-#'
-#' @examples
-#' f <- sizeGrowthRatio(500, 500, 1.25)
-#' f(c(400, 400))
-#' f(c(500, 500))
-#' f(c(530, 550))
-#' f(c(625, 700))
-#'
-#' @export
-sizeGrowthRatio <- function(width = 400, height = 400, growthRate = 1.2) {
-  round_dim_up <- function(x, base, rate) {
-    power <- ceiling(log(x / base, rate))
-    ceiling(base * rate^power)
-  }
-
-  function(dims) {
-    if (length(dims) != 2) {
-      stop("dims must be a vector with two numbers, for width and height.")
-    }
-    c(
-      round_dim_up(dims[1], width,  growthRate),
-      round_dim_up(dims[2], height, growthRate)
-    )
-  }
-}

R/render-plot.R

@@ -93,22 +93,13 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
   # return a promise). The idea is that the (cached) return value from this
   # reactive can be used for varying width/heights, as it includes the
   # displaylist, which is resolution independent.
-  drawReactive <- reactive(label = "plotObj", {
+  drawReactive <- reactive(label = "plotObj", ..stacktraceon = FALSE, {
     hybrid_chain(
       {
         # If !execOnResize, don't invalidate when width/height changes.
         dims <- if (execOnResize) getDims() else isolate(getDims())
         pixelratio <- session$clientData$pixelratio %OR% 1
-        do.call("drawPlot", c(
-          list(
-            name = outputName,
-            session = session,
-            func = func,
-            width = dims$width,
-            height = dims$height,
-            pixelratio = pixelratio,
-            res = res
-          ), args))
+        drawPlot(outputName, session, func, dims$width, dims$height, pixelratio, res)
       },
       catch = function(reason) {
         # Non-isolating read. A common reason for errors in plotting is because
@@ -133,12 +124,7 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
       function(result) {
         dims <- getDims()
         pixelratio <- session$clientData$pixelratio %OR% 1
-        result <- do.call("resizeSavedPlot", c(
-          list(name, shinysession, result, dims$width, dims$height, pixelratio, res),
-          args
-        ))
-
-        result$img
+        resizeSavedPlot(name, shinysession, result, dims$width, dims$height, pixelratio, res)
       }
     )
   }
@@ -153,28 +139,26 @@ renderPlot <- function(expr, width='auto', height='auto', res=72, ...,
   markRenderFunction(outputFunc, renderFunc, outputArgs = outputArgs)
 }
 
-resizeSavedPlot <- function(name, session, result, width, height, pixelratio, res, ...) {
+resizeSavedPlot <- function(name, session, result, width, height, pixelratio, res) {
   if (result$img$width == width && result$img$height == height &&
       result$pixelratio == pixelratio && result$res == res) {
-    return(result)
+    return(result$img)
   }
 
   coordmap <- NULL
   outfile <- plotPNG(function() {
     grDevices::replayPlot(result$recordedPlot)
-    coordmap <<- getCoordmap(result$plotResult, width*pixelratio, height*pixelratio, res*pixelratio)
-  }, width = width*pixelratio, height = height*pixelratio, res = res*pixelratio, ...)
+    coordmap <<- getCoordmap(result$plotResult, width, height, pixelratio, res)
+  }, width = width*pixelratio, height = height*pixelratio, res = res*pixelratio)
   on.exit(unlink(outfile), add = TRUE)
 
-  result$img <- list(
+  img <- list(
     src = session$fileUrl(name, outfile, contentType = "image/png"),
     width = width,
     height = height,
     coordmap = coordmap,
     error = attr(coordmap, "error", exact = TRUE)
   )
-
-  result
 }
 
 drawPlot <- function(name, session, func, width, height, pixelratio, res, ...) {
@@ -231,7 +215,7 @@ drawPlot <- function(name, session, func, width, height, pixelratio, res, ...) {
             list(
               plotResult = value,
               recordedPlot = grDevices::recordPlot(),
-              coordmap = getCoordmap(value, width*pixelratio, height*pixelratio, res*pixelratio),
+              coordmap = getCoordmap(value, width, height, pixelratio, res),
               pixelratio = pixelratio,
               res = res
             )
@@ -251,7 +235,6 @@ drawPlot <- function(name, session, func, width, height, pixelratio, res, ...) {
         # Get coordmap error message if present
         error = attr(result$coordmap, "error", exact = TRUE)
       ))
-
       result
     },
     finally = function() {
@@ -284,26 +267,22 @@ custom_print.ggplot <- function(x) {
 # below. For base graphics:
 # plot(mtcars$wt, mtcars$mpg)
 # str(getPrevPlotCoordmap(400, 300))
-# List of 2
-#  $ panels:List of 1
-#   ..$ :List of 4
-#   .. ..$ domain :List of 4
-#   .. .. ..$ left  : num 1.36
-#   .. .. ..$ right : num 5.58
-#   .. .. ..$ bottom: num 9.46
-#   .. .. ..$ top   : num 34.8
-#   .. ..$ range  :List of 4
-#   .. .. ..$ left  : num 65.6
-#   .. .. ..$ right : num 366
-#   .. .. ..$ bottom: num 238
-#   .. .. ..$ top   : num 48.2
-#   .. ..$ log    :List of 2
-#   .. .. ..$ x: NULL
-#   .. .. ..$ y: NULL
-#   .. ..$ mapping: Named list()
-#  $ dims  :List of 2
-#   ..$ width : num 400
-#   ..$ height: num 300
+# List of 1
+#  $ :List of 4
+#   ..$ domain :List of 4
+#   .. ..$ left  : num 1.36
+#   .. ..$ right : num 5.58
+#   .. ..$ bottom: num 9.46
+#   .. ..$ top   : num 34.8
+#   ..$ range  :List of 4
+#   .. ..$ left  : num 50.4
+#   .. ..$ right : num 373
+#   .. ..$ bottom: num 199
+#   .. ..$ top   : num 79.6
+#   ..$ log    :List of 2
+#   .. ..$ x: NULL
+#   .. ..$ y: NULL
+#   ..$ mapping: Named list()
 #
 # For ggplot2, first you need to define the print.ggplot function from inside
 # renderPlot, then use it to print the plot:
@@ -322,33 +301,29 @@ custom_print.ggplot <- function(x) {
 # }
 #
 # p <- print(ggplot(mtcars, aes(wt, mpg)) + geom_point())
-# str(getGgplotCoordmap(p, 400, 300, 72))
-# List of 2
-#  $ panels:List of 1
-#   ..$ :List of 8
-#   .. ..$ panel     : num 1
-#   .. ..$ row       : num 1
-#   .. ..$ col       : num 1
-#   .. ..$ panel_vars: Named list()
-#   .. ..$ log       :List of 2
-#   .. .. ..$ x: NULL
-#   .. .. ..$ y: NULL
-#   .. ..$ domain    :List of 4
-#   .. .. ..$ left  : num 1.32
-#   .. .. ..$ right : num 5.62
-#   .. .. ..$ bottom: num 9.22
-#   .. .. ..$ top   : num 35.1
-#   .. ..$ mapping   :List of 2
-#   .. .. ..$ x: chr "wt"
-#   .. .. ..$ y: chr "mpg"
-#   .. ..$ range     :List of 4
-#   .. .. ..$ left  : num 33.3
-#   .. .. ..$ right : num 355
-#   .. .. ..$ bottom: num 328
-#   .. .. ..$ top   : num 5.48
-#  $ dims  :List of 2
-#   ..$ width : num 400
-#   ..$ height: num 300
+# str(getGgplotCoordmap(p, 1, 72))
+# List of 1
+#  $ :List of 10
+#   ..$ panel     : int 1
+#   ..$ row       : int 1
+#   ..$ col       : int 1
+#   ..$ panel_vars: Named list()
+#   ..$ log       :List of 2
+#   .. ..$ x: NULL
+#   .. ..$ y: NULL
+#   ..$ domain    :List of 4
+#   .. ..$ left  : num 1.32
+#   .. ..$ right : num 5.62
+#   .. ..$ bottom: num 9.22
+#   .. ..$ top   : num 35.1
+#   ..$ mapping   :List of 2
+#   .. ..$ x: chr "wt"
+#   .. ..$ y: chr "mpg"
+#   ..$ range     :List of 4
+#   .. ..$ left  : num 40.8
+#   .. ..$ right : num 446
+#   .. ..$ bottom: num 263
+#   .. ..$ top   : num 14.4
 #
 # With a faceted ggplot2 plot, the outer list contains two objects, each of
 # which represents one panel. In this example, there is one panelvar, but there
@@ -356,63 +331,59 @@ custom_print.ggplot <- function(x) {
 # mtc <- mtcars
 # mtc$am <- factor(mtc$am)
 # p <- print(ggplot(mtc, aes(wt, mpg)) + geom_point() + facet_wrap(~ am))
-# str(getGgplotCoordmap(p, 400, 300, 72))
+# str(getGgplotCoordmap(p, 1, 72))
 # List of 2
-#  $ panels:List of 2
-#   ..$ :List of 8
-#   .. ..$ panel     : num 1
-#   .. ..$ row       : int 1
-#   .. ..$ col       : int 1
-#   .. ..$ panel_vars:List of 1
-#   .. .. ..$ panelvar1: Factor w/ 2 levels "0","1": 1
-#   .. ..$ log       :List of 2
-#   .. .. ..$ x: NULL
-#   .. .. ..$ y: NULL
-#   .. ..$ domain    :List of 4
-#   .. .. ..$ left  : num 1.32
-#   .. .. ..$ right : num 5.62
-#   .. .. ..$ bottom: num 9.22
-#   .. .. ..$ top   : num 35.1
-#   .. ..$ mapping   :List of 3
-#   .. .. ..$ x        : chr "wt"
-#   .. .. ..$ y        : chr "mpg"
-#   .. .. ..$ panelvar1: chr "am"
-#   .. ..$ range     :List of 4
-#   .. .. ..$ left  : num 33.3
-#   .. .. ..$ right : num 191
-#   .. .. ..$ bottom: num 328
-#   .. .. ..$ top   : num 23.1
-#   ..$ :List of 8
-#   .. ..$ panel     : num 2
-#   .. ..$ row       : int 1
-#   .. ..$ col       : int 2
-#   .. ..$ panel_vars:List of 1
-#   .. .. ..$ panelvar1: Factor w/ 2 levels "0","1": 2
-#   .. ..$ log       :List of 2
-#   .. .. ..$ x: NULL
-#   .. .. ..$ y: NULL
-#   .. ..$ domain    :List of 4
-#   .. .. ..$ left  : num 1.32
-#   .. .. ..$ right : num 5.62
-#   .. .. ..$ bottom: num 9.22
-#   .. .. ..$ top   : num 35.1
-#   .. ..$ mapping   :List of 3
-#   .. .. ..$ x        : chr "wt"
-#   .. .. ..$ y        : chr "mpg"
-#   .. .. ..$ panelvar1: chr "am"
-#   .. ..$ range     :List of 4
-#   .. .. ..$ left  : num 197
-#   .. .. ..$ right : num 355
-#   .. .. ..$ bottom: num 328
-#   .. .. ..$ top   : num 23.1
-#  $ dims  :List of 2
-#   ..$ width : num 400
-#   ..$ height: num 300
+#  $ :List of 10
+#   ..$ panel     : int 1
+#   ..$ row       : int 1
+#   ..$ col       : int 1
+#   ..$ panel_vars:List of 1
+#   .. ..$ panelvar1: Factor w/ 2 levels "0","1": 1
+#   ..$ log       :List of 2
+#   .. ..$ x: NULL
+#   .. ..$ y: NULL
+#   ..$ domain    :List of 4
+#   .. ..$ left  : num 1.32
+#   .. ..$ right : num 5.62
+#   .. ..$ bottom: num 9.22
+#   .. ..$ top   : num 35.1
+#   ..$ mapping   :List of 3
+#   .. ..$ x        : chr "wt"
+#   .. ..$ y        : chr "mpg"
+#   .. ..$ panelvar1: chr "am"
+#   ..$ range     :List of 4
+#   .. ..$ left  : num 45.6
+#   .. ..$ right : num 317
+#   .. ..$ bottom: num 251
+#   .. ..$ top   : num 35.7
+#  $ :List of 10
+#   ..$ panel     : int 2
+#   ..$ row       : int 1
+#   ..$ col       : int 2
+#   ..$ panel_vars:List of 1
+#   .. ..$ panelvar1: Factor w/ 2 levels "0","1": 2
+#   ..$ log       :List of 2
+#   .. ..$ x: NULL
+#   .. ..$ y: NULL
+#   ..$ domain    :List of 4
+#   .. ..$ left  : num 1.32
+#   .. ..$ right : num 5.62
+#   .. ..$ bottom: num 9.22
+#   .. ..$ top   : num 35.1
+#   ..$ mapping   :List of 3
+#   .. ..$ x        : chr "wt"
+#   .. ..$ y        : chr "mpg"
+#   .. ..$ panelvar1: chr "am"
+#   ..$ range     :List of 4
+#   .. ..$ left  : num 322
+#   .. ..$ right : num 594
+#   .. ..$ bottom: num 251
+#   .. ..$ top   : num 35.7
 
 
-getCoordmap <- function(x, width, height, res) {
+getCoordmap <- function(x, width, height, pixelratio, res) {
   if (inherits(x, "ggplot_build_gtable")) {
-    getGgplotCoordmap(x, width, height, res)
+    getGgplotCoordmap(x, pixelratio, res)
   } else {
     getPrevPlotCoordmap(width, height)
   }
@@ -432,7 +403,7 @@ getPrevPlotCoordmap <- function(width, height) {
   }
 
   # Wrapped in double list because other types of plots can have multiple panels.
-  panel_info <- list(list(
+  list(list(
     # Bounds of the plot area, in data space
     domain = list(
       left = usrCoords[1],
@@ -442,10 +413,10 @@ getPrevPlotCoordmap <- function(width, height) {
     ),
     # The bounds of the plot area, in DOM pixels
     range = list(
-      left = graphics::grconvertX(usrBounds[1], 'user', 'ndc') * width,
-      right = graphics::grconvertX(usrBounds[2], 'user', 'ndc') * width,
-      bottom = (1-graphics::grconvertY(usrBounds[3], 'user', 'ndc')) * height - 1,
-      top = (1-graphics::grconvertY(usrBounds[4], 'user', 'ndc')) * height - 1
+      left = graphics::grconvertX(usrBounds[1], 'user', 'nfc') * width,
+      right = graphics::grconvertX(usrBounds[2], 'user', 'nfc') * width,
+      bottom = (1-graphics::grconvertY(usrBounds[3], 'user', 'nfc')) * height - 1,
+      top = (1-graphics::grconvertY(usrBounds[4], 'user', 'nfc')) * height - 1
     ),
     log = list(
       x = if (graphics::par('xlog')) 10 else NULL,
@@ -456,43 +427,27 @@ getPrevPlotCoordmap <- function(width, height) {
     # (not an array) in JSON.
     mapping = list(x = NULL)[0]
   ))
-
-  list(
-    panels = panel_info,
-    dims = list(
-      width = width,
-      height =height
-    )
-  )
 }
 
 # Given a ggplot_build_gtable object, return a coordmap for it.
-getGgplotCoordmap <- function(p, width, height, res) {
+getGgplotCoordmap <- function(p, pixelratio, res) {
   if (!inherits(p, "ggplot_build_gtable"))
     return(NULL)
 
   tryCatch({
     # Get info from built ggplot object
-    panel_info <- find_panel_info(p$build)
+    info <- find_panel_info(p$build)
 
     # Get ranges from gtable - it's possible for this to return more elements than
     # info, because it calculates positions even for panels that aren't present.
     # This can happen with facet_wrap.
-    ranges <- find_panel_ranges(p$gtable, res)
+    ranges <- find_panel_ranges(p$gtable, pixelratio, res)
 
-    for (i in seq_along(panel_info)) {
-      panel_info[[i]]$range <- ranges[[i]]
+    for (i in seq_along(info)) {
+      info[[i]]$range <- ranges[[i]]
     }
 
-    return(
-      list(
-        panels = panel_info,
-        dims = list(
-          width = width,
-          height = height
-        )
-      )
-    )
+    return(info)
 
   }, error = function(e) {
     # If there was an error extracting info from the ggplot object, just return
@@ -519,11 +474,13 @@ find_panel_info <- function(b) {
 # This is for ggplot2>2.2.1, after an API was introduced for extracting
 # information about the plot object.
 find_panel_info_api <- function(b) {
+  # Workaround for check NOTE, until ggplot2 >2.2.1 is released
+  colon_colon <- `::`
   # Given a built ggplot object, return x and y domains (data space coords) for
   # each panel.
-  layout <- ggplot2::summarise_layout(b)
-  coord  <- ggplot2::summarise_coord(b)
-  layers <- ggplot2::summarise_layers(b)
+  layout <- colon_colon("ggplot2", "summarise_layout")(b)
+  coord  <- colon_colon("ggplot2", "summarise_coord")(b)
+  layers <- colon_colon("ggplot2", "summarise_layers")(b)
 
   # Given x and y scale objects and a coord object, return a list that has
   # the bases of log transformations for x and y, or NULL if it's not a
@@ -586,11 +543,9 @@ find_panel_info_api <- function(b) {
     # ggplot object. The original uses quoted expressions; convert to
     # character.
     mapping <- layers$mapping[[1]]
-    # In ggplot2 <=2.2.1, the mappings are expressions. In later versions, they
-    # are quosures. `deparse(quo_squash(x))` will handle both cases.
-    # as.character results in unexpected behavior for expressions like `wt/2`,
-    # which is why we use deparse.
-    mapping <- lapply(mapping, function(x) deparse(rlang::quo_squash(x)))
+    # lapply'ing as.character results in unexpected behavior for expressions
+    # like `wt/2`; deparse handles it correctly.
+    mapping <- lapply(mapping, deparse)
 
     # If either x or y is not present, give it a NULL entry.
     mapping <- mergeVectors(list(x = NULL, y = NULL), mapping)
@@ -772,9 +727,8 @@ find_panel_info_non_api <- function(b, ggplot_format) {
       mappings <- c(list(mappings), layer_mappings)
       mappings <- Reduce(x = mappings, init = list(x = NULL, y = NULL),
         function(init, m) {
-          # Can't use m$x/m$y; you get a partial match with xintercept/yintercept
-          if (is.null(init[["x"]]) && !is.null(m[["x"]])) init$x <- m[["x"]]
-          if (is.null(init[["y"]]) && !is.null(m[["y"]])) init$y <- m[["y"]]
+          if (is.null(init$x) && !is.null(m$x)) init$x <- m$x
+          if (is.null(init$y) && !is.null(m$y)) init$y <- m$y
           init
         }
       )
@@ -853,7 +807,7 @@ find_panel_info_non_api <- function(b, ggplot_format) {
 
 
 # Given a gtable object, return the x and y ranges (in pixel dimensions)
-find_panel_ranges <- function(g, res) {
+find_panel_ranges <- function(g, pixelratio, res) {
   # Given a vector of unit objects, return logical vector indicating which ones
   # are "null" units. These units use the remaining available width/height --
   # that is, the space not occupied by elements that have an absolute size.
@@ -983,15 +937,26 @@ find_panel_ranges <- function(g, res) {
   layout <- layout[order(layout$t, layout$l), ]
   layout$panel <- seq_len(nrow(layout))
 
+  # When using a HiDPI client on a Linux server, the pixel
+  # dimensions are doubled, so we have to divide the dimensions by
+  # `pixelratio`. When a HiDPI client is used on a Mac server (with
+  # the quartz device), the pixel dimensions _aren't_ doubled, even though
+  # the image has double size. In the latter case we don't have to scale the
+  # numbers down.
+  pix_ratio <- 1
+  if (!grepl("^quartz", names(grDevices::dev.cur()))) {
+    pix_ratio <- pixelratio
+  }
+
   # Return list of lists, where each inner list has left, right, top, bottom
   # values for a panel
   lapply(seq_len(nrow(layout)), function(i) {
     p <- layout[i, , drop = FALSE]
     list(
-      left   = x_pos[p$l - 1],
-      right  = x_pos[p$r],
-      bottom = y_pos[p$b],
-      top    = y_pos[p$t - 1]
+      left   = x_pos[p$l - 1] / pix_ratio,
+      right  = x_pos[p$r] / pix_ratio,
+      bottom = y_pos[p$b] / pix_ratio,
+      top    = y_pos[p$t - 1] / pix_ratio
     )
   })
 }

R/server-input-handlers.R

@@ -142,7 +142,6 @@ registerInputHandler("shiny.matrix", function(data, ...) {
   return(m)
 })
 
-
 registerInputHandler("shiny.number", function(val, ...){
   ifelse(is.null(val), NA, val)
 })
@@ -221,21 +220,3 @@ registerInputHandler("shiny.file", function(val, shinysession, name) {
 
   val
 })
-
-
-# to be used with !!!answer
-registerInputHandler("shiny.symbolList", function(val, ...) {
-  if (is.null(val)) {
-    list()
-  } else {
-    lapply(val, as.symbol)
-  }
-})
-# to be used with !!answer
-registerInputHandler("shiny.symbol", function(val, ...) {
-  if (is.null(val) || identical(val, "")) {
-    NULL
-  } else {
-    as.symbol(val)
-  }
-})

R/server.R

@@ -53,23 +53,21 @@ registerClient <- function(client) {
 #' @export
 addResourcePath <- function(prefix, directoryPath) {
   prefix <- prefix[1]
-  if (!grepl('^[a-z0-9\\-_][a-z0-9\\-_.]*$', prefix, ignore.case = TRUE, perl = TRUE)) {
+  if (!grepl('^[a-z0-9\\-_][a-z0-9\\-_.]*$', prefix, ignore.case=TRUE, perl=TRUE)) {
     stop("addResourcePath called with invalid prefix; please see documentation")
   }
+
   if (prefix %in% c('shared')) {
     stop("addResourcePath called with the reserved prefix '", prefix, "'; ",
          "please use a different prefix")
   }
-  normalizedPath <- tryCatch(normalizePath(directoryPath, mustWork = TRUE),
-    error = function(e) {
-      stop("Couldn't normalize path in `addResourcePath`, with arguments: ",
-        "`prefix` = '", prefix, "'; `directoryPath` = '" , directoryPath, "'")
-    }
-  )
-  .globals$resources[[prefix]] <- list(
-    directoryPath = normalizedPath,
-    func = staticHandler(normalizedPath)
-  )
+
+  directoryPath <- normalizePath(directoryPath, mustWork=TRUE)
+
+  existing <- .globals$resources[[prefix]]
+
+  .globals$resources[[prefix]] <- list(directoryPath=directoryPath,
+                                       func=staticHandler(directoryPath))
 }
 
 resourcePathHandler <- function(req) {
@@ -279,19 +277,7 @@ createAppHandlers <- function(httpHandlers, serverFuncSource) {
                   shinysession$setShowcase(mode)
               }
 
-              # In shinysession$createBookmarkObservers() above, observers may be
-              # created, which puts the shiny session in busyCount > 0 state. That
-              # prevents the manageInputs here from taking immediate effect, by
-              # default. The manageInputs here needs to take effect though, because
-              # otherwise the bookmark observers won't find the clientData they are
-              # looking for. So use `now = TRUE` to force the changes to be
-              # immediate.
-              #
-              # FIXME: break createBookmarkObservers into two separate steps, one
-              # before and one after manageInputs, and put the observer creation
-              # in the latter. Then add an assertion that busyCount == 0L when
-              # this manageInputs is called.
-              shinysession$manageInputs(msg$data, now = TRUE)
+              shinysession$manageInputs(msg$data)
 
               # The client tells us what singletons were rendered into
               # the initial page
@@ -419,10 +405,7 @@ startApp <- function(appObj, port, host, quiet) {
 
   if (is.numeric(port) || is.integer(port)) {
     if (!quiet) {
-      hostString <- host
-      if (httpuv::ipFamily(host) == 6L)
-        hostString <- paste0("[", hostString, "]")
-      message('\n', 'Listening on http://', hostString, ':', port)
+      message('\n', 'Listening on http://', host, ':', port)
     }
     return(startServer(host, port, handlerManager$createHttpuvApp()))
   } else if (is.character(port)) {
@@ -579,16 +562,12 @@ runApp <- function(appDir=getwd(),
     .globals$running <- FALSE
   }, add = TRUE)
 
-  # Enable per-app Shiny options, for shinyOptions() and getShinyOption().
+  # Enable per-app Shiny options
   oldOptionSet <- .globals$options
   on.exit({
     .globals$options <- oldOptionSet
   },add = TRUE)
 
-  # A unique identifier associated with this run of this application. It is
-  # shared across sessions.
-  shinyOptions(appToken = createUniqueId(8))
-
   # Make warnings print immediately
   # Set pool.scheduler to support pool package
   ops <- options(
@@ -598,11 +577,6 @@ runApp <- function(appDir=getwd(),
   )
   on.exit(options(ops), add = TRUE)
 
-  # Set up default cache for app.
-  if (is.null(getShinyOption("cache"))) {
-    shinyOptions(cache = MemoryCache$new())
-  }
-
   appParts <- as.shiny.appobj(appDir)
 
   # The lines below set some of the app's running options, which
@@ -782,17 +756,8 @@ runApp <- function(appDir=getwd(),
   }, add = TRUE)
 
   if (!is.character(port)) {
-    browseHost <- host
-    if (identical(host, "0.0.0.0")) {
-      # http://0.0.0.0/ doesn't work on QtWebKit (i.e. RStudio viewer)
-      browseHost <- "127.0.0.1"
-    } else if (identical(host, "::")) {
-      browseHost <- "::1"
-    }
-
-    if (httpuv::ipFamily(browseHost) == 6L) {
-      browseHost <- paste0("[", browseHost, "]")
-    }
+    # http://0.0.0.0/ doesn't work on QtWebKit (i.e. RStudio viewer)
+    browseHost <- if (identical(host, "0.0.0.0")) "127.0.0.1" else host
 
     appUrl <- paste("http://", browseHost, ":", port, sep="")
     if (is.function(launch.browser))
@@ -817,7 +782,7 @@ runApp <- function(appDir=getwd(),
   ..stacktraceoff..(
     captureStackTraces({
       while (!.globals$stopped) {
-        ..stacktracefloor..(serviceApp())
+        serviceApp()
         Sys.sleep(0.001)
       }
     })

R/shiny.R

@@ -445,8 +445,6 @@ ShinySession <- R6Class(
     testMode = FALSE,                # Are we running in test mode?
     testExportExprs = list(),
     outputValues = list(),           # Saved output values (for testing mode)
-    currentOutputName = NULL,        # Name of the currently-running output
-    outputInfo = list(),             # List of information for each output
     testSnapshotUrl = character(0),
 
     sendResponse = function(requestMsg, value) {
@@ -493,16 +491,6 @@ ShinySession <- R6Class(
         return(defaultValue)
       return(result)
     },
-    withCurrentOutput = function(name, expr) {
-      if (!is.null(private$currentOutputName)) {
-        stop("Nested calls to withCurrentOutput() are not allowed.")
-      }
-
-      promises::with_promise_domain(
-        createVarPromiseDomain(private, "currentOutputName", name),
-        expr
-      )
-    },
     shouldSuspend = function(name) {
       # Find corresponding hidden state clientData variable, with the format
       # "output_foo_hidden". (It comes from .clientdata_output_foo_hidden
@@ -703,7 +691,6 @@ ShinySession <- R6Class(
     request = 'ANY',      # Websocket request object
     singletons = character(0),  # Tracks singleton HTML fragments sent to the page
     userData = 'environment',
-    cache = NULL,         # A cache object used in the session
     user = NULL,
     groups = NULL,
 
@@ -719,8 +706,8 @@ ShinySession <- R6Class(
       private$flushCallbacks <- Callbacks$new()
       private$flushedCallbacks <- Callbacks$new()
       private$inputReceivedCallbacks <- Callbacks$new()
-      private$.input      <- ReactiveValues$new(dedupe = FALSE)
-      private$.clientData <- ReactiveValues$new(dedupe = TRUE)
+      private$.input      <- ReactiveValues$new()
+      private$.clientData <- ReactiveValues$new()
       private$timingRecorder <- ShinyServerTimingRecorder$new()
       self$progressStack <- Stack$new()
       self$files <- Map$new()
@@ -738,8 +725,6 @@ ShinySession <- R6Class(
       private$.outputs <- list()
       private$.outputOptions <- list()
 
-      self$cache <- MemoryCache$new()
-
       private$bookmarkCallbacks <- Callbacks$new()
       private$bookmarkedCallbacks <- Callbacks$new()
       private$restoreCallbacks <- Callbacks$new()
@@ -916,11 +901,9 @@ ShinySession <- R6Class(
         # Create subdir for this scope
         if (!is.null(state$dir)) {
           scopeState$dir <- file.path(state$dir, namespace)
-          if (!dirExists(scopeState$dir)) {
-            res <- dir.create(scopeState$dir)
-            if (res == FALSE) {
-              stop("Error creating subdirectory for scope ", namespace)
-            }
+          res <- dir.create(scopeState$dir)
+          if (res == FALSE) {
+            stop("Error creating subdirectory for scope ", namespace)
           }
         }
 
@@ -978,9 +961,8 @@ ShinySession <- R6Class(
         stop("x must be a reactivevalues object")
 
       impl <- .subset2(x, 'impl')
-      key <- .subset2(x, 'ns')(name)
-      impl$freeze(key)
-      self$onFlushed(function() impl$thaw(key))
+      impl$freeze(name)
+      self$onFlushed(function() impl$thaw(name))
     },
 
     onSessionEnded = function(sessionEndedCallback) {
@@ -1042,16 +1024,9 @@ ShinySession <- R6Class(
       # name not working unless name was eagerly evaluated. Yikes!
       force(name)
 
-      # If overwriting an output object, destroy the previous copy of it
+      # If overwriting an output object, suspend the previous copy of it
       if (!is.null(private$.outputs[[name]])) {
-        private$.outputs[[name]]$destroy()
-      }
-
-      if (is.null(func)) {
-        # If func is null, give it an "empty" output function so it can go
-        # through the logic below. If we simply returned at this point, the
-        # previous output (if any) would continue to show in the client.
-        func <- missingOutput
+        private$.outputs[[name]]$suspend()
       }
 
       if (is.function(func)) {
@@ -1088,11 +1063,7 @@ ShinySession <- R6Class(
           # to include the $then/$catch calls below?
           hybrid_chain(
             hybrid_chain(
-              {
-                private$withCurrentOutput(name, {
-                  shinyCallingHandlers(func())
-                })
-              },
+              shinyCallingHandlers(func()),
               catch = function(cond) {
                 if (inherits(cond, "shiny.custom.error")) {
                   if (isTRUE(getOption("show.error.messages"))) printError(cond)
@@ -1195,10 +1166,8 @@ ShinySession <- R6Class(
 
         # Schedule execution of onFlushed callbacks
         on.exit({
-          withReactiveDomain(self, {
-            # ..stacktraceon matches with the top-level ..stacktraceoff..
-            private$flushedCallbacks$invoke(..stacktraceon = TRUE)
-          })
+          # ..stacktraceon matches with the top-level ..stacktraceoff..
+          private$flushedCallbacks$invoke(..stacktraceon = TRUE)
         }, add = TRUE)
 
         if (!hasPendingUpdates()) {
@@ -1335,47 +1304,6 @@ ShinySession <- R6Class(
       }
     },
 
-    getCurrentOutputInfo = function() {
-      name <- private$currentOutputName
-
-      tmp_info <- private$outputInfo[[name]] %OR% list(name = name)
-
-      # cd_names() returns names of all items in clientData, without taking a
-      # reactive dependency. It is a function and it's memoized, so that we do
-      # the (relatively) expensive isolate(names(...)) call only when needed,
-      # and at most one time in this function.
-      .cd_names <- NULL
-      cd_names <- function() {
-        if (is.null(.cd_names)) {
-          .cd_names <<- isolate(names(self$clientData))
-        }
-        .cd_names
-      }
-
-      # If we don't already have width for this output info, see if it's
-      # present, and if so, add it.
-      if (! ("width" %in% names(tmp_info)) ) {
-        width_name  <- paste0("output_", name, "_width")
-        if (width_name %in% cd_names()) {
-          tmp_info$width <- reactive({
-            self$clientData[[width_name]]
-          })
-        }
-      }
-
-      if (! ("height" %in% names(tmp_info)) ) {
-        height_name  <- paste0("output_", name, "_height")
-        if (height_name %in% cd_names()) {
-          tmp_info$height <- reactive({
-            self$clientData[[height_name]]
-          })
-        }
-      }
-
-      private$outputInfo[[name]] <- tmp_info
-      private$outputInfo[[name]]
-    },
-
     createBookmarkObservers = function() {
       # This registers observers for bookmarking to work.
 
@@ -1926,16 +1854,10 @@ ShinySession <- R6Class(
         }
       }
     },
-    # Set the normal and client data input variables. Normally, managing
-    # inputs doesn't take immediate effect when there are observers that
-    # are pending execution or currently executing (including having
-    # started async operations that have yielded control, but not yet
-    # completed). The `now` argument can force this. It should generally
-    # not be used, but we're adding it to get around a show-stopping bug
-    # for Shiny v1.1 (see the call site for more details).
-    manageInputs = function(data, now = FALSE) {
+    # Set the normal and client data input variables
+    manageInputs = function(data) {
       force(data)
-      doManageInputs <- function() {
+      self$cycleStartAction(function() {
         private$inputReceivedCallbacks$invoke(data)
 
         data_names <- names(data)
@@ -1953,12 +1875,7 @@ ShinySession <- R6Class(
         private$.clientData$mset(input_clientdata)
 
         self$manageHiddenOutputs()
-      }
-      if (isTRUE(now)) {
-        doManageInputs()
-      } else {
-        self$cycleStartAction(doManageInputs)
-      }
+      })
     },
     outputOptions = function(name, ...) {
       # If no name supplied, return the list of options for all outputs
@@ -2119,16 +2036,6 @@ outputOptions <- function(x, name, ...) {
   .subset2(x, 'impl')$outputOptions(name, ...)
 }
 
-
-#' Get information about the output that is currently being executed.
-#'
-#' @param session The current Shiny session.
-#'
-#' @export
-getCurrentOutputInfo <- function(session = getDefaultReactiveDomain()) {
-  session$getCurrentOutputInfo()
-}
-
 #' Add callbacks for Shiny session events
 #'
 #' These functions are for registering callbacks on Shiny session events.
@@ -2197,9 +2104,7 @@ flushPendingSessions <- function() {
 #'   called from within the server function, this will default to the current
 #'   session, and the callback will be invoked when the current session ends. If
 #'   \code{onStop} is called outside a server function, then the callback will
-#'   be invoked with the application exits. If \code{NULL}, it is the same as
-#'   calling \code{onStop} outside of the server function, and the callback will
-#'   be invoked when the application exits.
+#'   be invoked with the application exits.
 #'
 #'
 #' @seealso \code{\link{onSessionEnded}()} for the same functionality, but at
@@ -2259,7 +2164,7 @@ flushPendingSessions <- function() {
 #' }
 #' @export
 onStop <- function(fun, session = getDefaultReactiveDomain()) {
-  if (is.null(session)) {
+  if (is.null(getDefaultReactiveDomain())) {
     return(.globals$onStopCallbacks$register(fun))
   } else {
     # Note: In the future if we allow scoping the onStop() callback to modules
@@ -2311,5 +2216,3 @@ ShinyServerTimingRecorder <- R6Class("ShinyServerTimingRecorder",
     }
   )
 )
-
-missingOutput <- function(...) req(FALSE)

R/shinywrappers.R

@@ -1,4 +1,4 @@
-utils::globalVariables('func')
+globalVariables('func')
 
 #' Mark a function as a render function
 #'
@@ -111,17 +111,13 @@ useRenderFunction <- function(renderFunc, inline = FALSE) {
   }
 
   id <- createUniqueId(8, "out")
-
-  o <- getDefaultReactiveDomain()$output
-  if (!is.null(o)) {
-    o[[id]] <- renderFunc
-    # If there's a namespace, we must respect it
-    id <- getDefaultReactiveDomain()$ns(id)
-  }
-
   # Make the id the first positional argument
   outputArgs <- c(list(id), outputArgs)
 
+  o <- getDefaultReactiveDomain()$output
+  if (!is.null(o))
+    o[[id]] <- renderFunc
+
   if (is.logical(formals(outputFunction)[["inline"]]) && !("inline" %in% names(outputArgs))) {
     outputArgs[["inline"]] <- inline
   }
@@ -437,7 +433,8 @@ renderText <- function(expr, env=parent.frame(), quoted=FALSE,
 
 #' UI Output
 #'
-#' Renders reactive HTML using the Shiny UI library.
+#' \bold{Experimental feature.} Makes a reactive version of a function that
+#' generates HTML using the Shiny UI library.
 #'
 #' The corresponding HTML output tag should be \code{div} and have the CSS class
 #' name \code{shiny-html-output} (or use \code{\link{uiOutput}}).
@@ -451,7 +448,7 @@ renderText <- function(expr, env=parent.frame(), quoted=FALSE,
 #'   call to \code{\link{uiOutput}} when \code{renderUI} is used in an
 #'   interactive R Markdown document.
 #'
-#' @seealso \code{\link{uiOutput}}
+#' @seealso conditionalPanel
 #' @export
 #' @examples
 #' ## Only run examples in interactive R sessions

R/timer.R

@@ -42,17 +42,6 @@ TimerCallbacks <- R6Class(
 
       return(id)
     },
-    unschedule = function(id) {
-      toRemoveIndices <- .times$id %in% id
-      toRemoveIds <- .times[toRemoveIndices, "id", drop = TRUE]
-      if (length(toRemoveIds) > 0) {
-        .times <<- .times[!toRemoveIndices,]
-        for (toRemoveId in as.character(toRemoveIds)) {
-          .funcs$remove(toRemoveId)
-        }
-      }
-      return(id %in% toRemoveIds)
-    },
     timeToNextEvent = function() {
       if (dim(.times)[1] == 0)
         return(Inf)
@@ -90,9 +79,13 @@ timerCallbacks <- TimerCallbacks$new()
 
 scheduleTask <- function(millis, callback) {
   cancelled <- FALSE
-  id <- timerCallbacks$schedule(millis, callback)
+  timerCallbacks$schedule(millis, function() {
+    if (!cancelled)
+      callback()
+  })
 
   function() {
-    invisible(timerCallbacks$unschedule(id))
+    cancelled <<- TRUE
+    callback <<- NULL # to allow for callback to be gc'ed
   }
 }

R/update-input.R

@@ -383,17 +383,13 @@ updateNumericInput <- function(session, inputId, label = NULL, value = NULL,
   session$sendInputMessage(inputId, message)
 }
 
-#' Update Slider Input Widget
-#'
-#' Change the value of a slider input on the client.
+#' Change the value of a slider input on the client
 #'
 #' @template update-input
 #' @param value The value to set for the input object.
 #' @param min Minimum value.
 #' @param max Maximum value.
 #' @param step Step size.
-#' @param timeFormat Date and POSIXt formatting.
-#' @param timezone The timezone offset for POSIXt objects.
 #'
 #' @seealso \code{\link{sliderInput}}
 #'
@@ -426,15 +422,22 @@ updateNumericInput <- function(session, inputId, label = NULL, value = NULL,
 #' }
 #' @export
 updateSliderInput <- function(session, inputId, label = NULL, value = NULL,
-  min = NULL, max = NULL, step = NULL, timeFormat = NULL, timezone = NULL)
+  min = NULL, max = NULL, step = NULL)
 {
-  dataType <- getSliderType(min, max, value)
+  # Make sure that value, min, max all have the same type, because we need
+  # special handling for dates and datetimes.
+  vals <- dropNulls(list(value, min, max))
 
-  if (is.null(timeFormat)) {
-    timeFormat <- switch(dataType, date = "%F", datetime = "%F %T", number = NULL)
+  type <- unique(lapply(vals, function(x) {
+    if      (inherits(x, "Date"))   "date"
+    else if (inherits(x, "POSIXt")) "datetime"
+    else                            "number"
+  }))
+  if (length(type) > 1) {
+    stop("Type mismatch for value, min, and max")
   }
 
-  if (dataType == "date" || dataType == "datetime") {
+  if ((length(type) == 1) && (type == "date" || type == "datetime")) {
     to_ms <- function(x) 1000 * as.numeric(as.POSIXct(x))
     if (!is.null(min))   min   <- to_ms(min)
     if (!is.null(max))   max   <- to_ms(max)
@@ -446,10 +449,7 @@ updateSliderInput <- function(session, inputId, label = NULL, value = NULL,
     value = formatNoSci(value),
     min = formatNoSci(min),
     max = formatNoSci(max),
-    step = formatNoSci(step),
-    `data-type` = dataType,
-    `time-format` = timeFormat,
-    timezone = timezone
+    step = formatNoSci(step)
   ))
   session$sendInputMessage(inputId, message)
 }
@@ -576,7 +576,7 @@ updateRadioButtons <- function(session, inputId, label = NULL, choices = NULL,
 #' @template update-input
 #' @inheritParams selectInput
 #'
-#' @seealso \code{\link{selectInput}} \code{\link{varSelectInput}}
+#' @seealso \code{\link{selectInput}}
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -643,94 +643,32 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
     return(updateSelectInput(session, inputId, label, choices, selected))
   }
 
-  noOptGroup <- TRUE
-  if (is.list(choices)) {
-    # check if list is nested
-    for (i in seq_along(choices)) {
-      if (is.list(choices[[i]]) || length(choices[[i]]) > 1) {
-        noOptGroup <- FALSE
-        break()
-      }
-    }
-  }
-  # convert choices to a data frame so it returns [{label: , value: , optgroup: },...]
-  choices <- if (is.data.frame(choices)) {
-    # jcheng 2018/09/25: I don't think we ever said data frames were OK to pass
-    # to updateSelectInput, but one of the example apps does this and at least
-    # one user noticed when we broke it.
-    # https://github.com/rstudio/shiny/issues/2172
-    # https://github.com/rstudio/shiny/issues/2192
-    as.data.frame(choices, stringsAsFactors = FALSE)
-  } else if (is.atomic(choices) || noOptGroup) {
-    # fast path for vectors and flat lists
-    if (is.list(choices)) {
-      choices <- unlist(choices)
-    }
-    if (is.null(names(choices))) {
+  # server side updateSelectizeInput
+  value <- unname(selected)
+  attr(choices, 'selected_value') <- value
+
+  # convert a single vector to a data frame so it returns {label: , value: }
+  # other objects return arbitrary JSON {x: , y: , foo: , ...}
+  choices <- if (is.atomic(choices)) {
+    # fast path
+    if(is.null(names(choices))) {
       lab <- as.character(choices)
     } else {
       lab <- names(choices)
       # replace empty names like: choices = c(a = 1, 2)
-      # in this case: names(choices) = c("a", "")
+      # int this case: names(choices) = c("a", "")
       # with replacement below choices will be: lab = c("a", "2")
       empty_names_indices <- lab == ""
       lab[empty_names_indices] <- as.character(choices[empty_names_indices])
     }
+    # lab shold be lower-case for faster case-insensitive matching - grepl(... , fixed = TRUE)
+    lab <- tolower(lab)
     data.frame(label = lab, value = choices, stringsAsFactors = FALSE)
   } else {
-    # slow path for nested lists/optgroups
-    list_names <- names(choices)
-    if (is.null(list_names)) {
-      list_names <- rep("", length(choices))
-    }
-
-    choice_list <- mapply(choices, list_names, FUN = function (choice, name) {
-      group <- ""
-      lab <- name
-      if (lab == "") lab <- as.character(choice)
-
-      if (is.list(choice) || length(choice) > 1) {
-        group <- rep(name, length(choice))
-        choice <- unlist(choice)
-
-        if (is.null(names(choice))) {
-          lab <- as.character(choice)
-        } else {
-          lab <- names(choice)
-          # replace empty names like: choices = c(a = 1, 2)
-          # in this case: names(choices) = c("a", "")
-          # with replacement below choices will be: lab = c("a", "2")
-          empty_names_indices <- lab == ""
-          lab[empty_names_indices] <- as.character(choice[empty_names_indices])
-        }
-      }
-
-      list(
-        label = lab,
-        value = as.character(choice),
-        # The name "optgroup" is because this is the default field where
-        # selectize will look for group IDs
-        optgroup = group
-      )
-    }, SIMPLIFY = FALSE)
-
-
-    extract_vector <- function(x, name) {
-      vecs <- lapply(x, `[[`, name)
-      do.call(c, vecs)
-    }
-
-    data.frame(
-      label = extract_vector(choice_list, "label"),
-      value = extract_vector(choice_list, "value"),
-      optgroup = extract_vector(choice_list, "optgroup"),
-      stringsAsFactors = FALSE, row.names = NULL
-    )
+    # slow path
+    as.data.frame(choices, stringsAsFactors = FALSE)
   }
 
-  value <- unname(selected)
-  attr(choices, 'selected_value') <- value
-
   message <- dropNulls(list(
     label = label,
     value = value,
@@ -738,53 +676,13 @@ updateSelectizeInput <- function(session, inputId, label = NULL, choices = NULL,
   ))
   session$sendInputMessage(inputId, message)
 }
-#' @rdname updateSelectInput
-#' @inheritParams varSelectInput
-#' @export
-updateVarSelectInput <- function(session, inputId, label = NULL, data = NULL, selected = NULL) {
-  if (is.null(data)) {
-    choices <- NULL
-  } else {
-    choices <- colnames(data)
-  }
-  updateSelectInput(
-    session = session,
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected
-  )
-}
-#' @rdname updateSelectInput
-#' @export
-updateVarSelectizeInput <- function(session, inputId, label = NULL, data = NULL, selected = NULL, options = list(), server = FALSE) {
-  if (is.null(data)) {
-    choices <- NULL
-  } else {
-    choices <- colnames(data)
-  }
-  updateSelectizeInput(
-    session = session,
-    inputId = inputId,
-    label = label,
-    choices = choices,
-    selected = selected,
-    options = options,
-    server = server
-  )
-}
-
-
 
 selectizeJSON <- function(data, req) {
   query <- parseQueryString(req$QUERY_STRING)
-
   # extract the query variables, conjunction (and/or), search string, maximum options
   var <- c(safeFromJSON(query$field))
-
   # all keywords in lower-case, for case-insensitive matching
   key <- unique(strsplit(tolower(query$query), '\\s+')[[1]])
-
   if (identical(key, '')) key <- character(0)
   mop <- as.numeric(query$maxop)
   vfd <- query$value  # the value field name
@@ -797,13 +695,19 @@ selectizeJSON <- function(data, req) {
       matches <- do.call(
         cbind,
         lapply(key, function(k) {
-          grepl(k, tolower(as.character(data[[v]])), fixed = TRUE)
+          if(is.character(data[[v]])) {
+            # according to updateSelectizeInput() we know that
+            # `data[[v]]` already in lower case
+            grepl(k, data[[v]], fixed = TRUE)
+          } else {
+            grepl(k, tolower(as.character(data[[v]])), fixed = TRUE)
+          }
         })
       )
       # merge column matches using OR, and match multiple keywords in one column
       # using the conjunction setting (AND or OR)
       matches <- rowSums(matches)
-      if (query$conju == 'and')
+      if(query$conju == 'and')
         idx <- idx | (matches == length(key))
       else
         idx <- idx | matches

R/utils.R

@@ -269,25 +269,6 @@ dirExists <- function(paths) {
   file.exists(paths) & file.info(paths)$isdir
 }
 
-# Removes empty directory (vectorized). This is needed because file.remove()
-# on Unix will remove empty directories, but on Windows, it will not. On
-# Windows, you would need to use unlink(recursive=TRUE), which is not very
-# safe. This function does it safely on Unix and Windows.
-dirRemove <- function(path) {
-  for (p in path) {
-    if (!dirExists(p)) {
-      stop("Cannot remove non-existent directory ", p, ".")
-    }
-    if (length(dir(p, all.files = TRUE, no.. = TRUE)) != 0) {
-      stop("Cannot remove non-empty directory ", p, ".")
-    }
-    result <- unlink(p, recursive = TRUE)
-    if (result == 1) {
-      stop("Error removing directory ", p, ".")
-    }
-  }
-}
-
 # Attempt to join a path and relative path, and turn the result into a
 # (normalized) absolute path. The result will only be returned if it is an
 # existing file/directory and is a descendant of dir.
@@ -1693,50 +1674,3 @@ setVisible <- function(value, visible) {
     (value)
   }
 }
-
-createVarPromiseDomain <- function(env, name, value) {
-  force(env)
-  force(name)
-  force(value)
-
-  promises::new_promise_domain(
-    wrapOnFulfilled = function(onFulfilled) {
-      function(...) {
-        orig <- env[[name]]
-        env[[name]] <- value
-        on.exit(env[[name]] <- orig)
-
-        onFulfilled(...)
-      }
-    },
-    wrapOnRejected = function(onRejected) {
-      function(...) {
-        orig <- env[[name]]
-        env[[name]] <- value
-        on.exit(env[[name]] <- orig)
-
-        onRejected(...)
-      }
-    },
-    wrapSync = function(expr) {
-      orig <- env[[name]]
-      env[[name]] <- value
-      on.exit(env[[name]] <- orig)
-
-      force(expr)
-    }
-  )
-}
-
-getSliderType <- function(min, max, value) {
-  vals <- dropNulls(list(value, min, max))
-  type <- unique(lapply(vals, function(x) {
-    if      (inherits(x, "Date"))   "date"
-    else if (inherits(x, "POSIXt")) "datetime"
-    else                            "number"
-  }))
-  if (length(type) > 1) {
-    stop("Type mismatch for `min`, `max`, and `value`. Each must be Date, POSIXt, or number.")
-  }
-  type[[1]]
-}

inst/staticdocs/index.r

@@ -41,7 +41,6 @@ sd_section("UI Inputs",
     "numericInput",
     "radioButtons",
     "selectInput",
-    "varSelectInput",
     "sliderInput",
     "submitButton",
     "textInput",
@@ -105,7 +104,6 @@ sd_section("Rendering functions",
   "Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.",
   c(
     "renderPlot",
-    "renderCachedPlot",
     "renderText",
     "renderPrint",
     "renderDataTable",
@@ -197,9 +195,7 @@ sd_section("Utility functions",
     "exprToFunction",
     "installExprFunction",
     "parseQueryString",
-    "getCurrentOutputInfo",
     "plotPNG",
-    "sizeGrowthRatio",
     "exportTestValues",
     "setSerializer",
     "snapshotExclude",
@@ -210,10 +206,7 @@ sd_section("Utility functions",
     "shinyDeprecated",
     "serverInfo",
     "shiny-options",
-    "onStop",
-    "diskCache",
-    "memoryCache",
-    "key_missing"
+    "onStop"
   )
 )
 sd_section("Plot interaction",

inst/www/shared/datepicker/css/bootstrap-datepicker3.css

@@ -1,9 +1,10 @@
 /*!
- * Datepicker for Bootstrap v1.8.0 (https://github.com/uxsolutions/bootstrap-datepicker)
+ * Datepicker for Bootstrap v1.6.4 (https://github.com/eternicode/bootstrap-datepicker)
  *
+ * Copyright 2012 Stefan Petre
+ * Improvements by Andrew Rowls
  * Licensed under the Apache License v2.0 (http://www.apache.org/licenses/LICENSE-2.0)
  */
-
 .datepicker {
   border-radius: 4px;
   direction: ltr;
@@ -11,13 +12,10 @@
 .datepicker-inline {
   width: 220px;
 }
-.datepicker-rtl {
+.datepicker.datepicker-rtl {
   direction: rtl;
 }
-.datepicker-rtl.dropdown-menu {
-  left: auto;
-}
-.datepicker-rtl table tr td span {
+.datepicker.datepicker-rtl table tr td span {
   float: right;
 }
 .datepicker-dropdown {
@@ -646,10 +644,6 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
 .datepicker tfoot tr th:hover {
   background: #eeeeee;
 }
-.datepicker .prev.disabled,
-.datepicker .next.disabled {
-  visibility: hidden;
-}
 .datepicker .cw {
   font-size: 10px;
   width: 12px;
@@ -676,6 +670,7 @@ fieldset[disabled] .datepicker table tr td span.active.disabled:hover.focus {
   min-width: 16px;
   padding: 4px 5px;
   line-height: 1.42857143;
+  text-shadow: 0 1px 0 #fff;
   border-width: 1px 0;
   margin-left: -5px;
   margin-right: -5px;

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.cs.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.cs={days:["Neděle","Pondělí","Úterý","Středa","Čtvrtek","Pátek","Sobota"],daysShort:["Ned","Pon","Úte","Stř","Čtv","Pát","Sob"],daysMin:["Ne","Po","Út","St","Čt","Pá","So"],months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],monthsShort:["Led","Úno","Bře","Dub","Kvě","Čer","Čnc","Srp","Zář","Říj","Lis","Pro"],today:"Dnes",clear:"Vymazat",monthsTitle:"Měsíc",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
+!function(a){a.fn.datepicker.dates.cs={days:["Neděle","Pondělí","Úterý","Středa","Čtvrtek","Pátek","Sobota"],daysShort:["Ned","Pon","Úte","Stř","Čtv","Pát","Sob"],daysMin:["Ne","Po","Út","St","Čt","Pá","So"],months:["Leden","Únor","Březen","Duben","Květen","Červen","Červenec","Srpen","Září","Říjen","Listopad","Prosinec"],monthsShort:["Led","Úno","Bře","Dub","Kvě","Čer","Čnc","Srp","Zář","Říj","Lis","Pro"],today:"Dnes",clear:"Vymazat",weekStart:1,format:"dd.m.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.da.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.da={days:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"],daysShort:["søn","man","tir","ons","tor","fre","lør"],daysMin:["sø","ma","ti","on","to","fr","lø"],months:["januar","februar","marts","april","maj","juni","juli","august","september","oktober","november","december"],monthsShort:["jan","feb","mar","apr","maj","jun","jul","aug","sep","okt","nov","dec"],today:"I Dag",clear:"Nulstil"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.eu.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.eu={days:["Igandea","Astelehena","Asteartea","Asteazkena","Osteguna","Ostirala","Larunbata"],daysShort:["Ig","Al","Ar","Az","Og","Ol","Lr"],daysMin:["Ig","Al","Ar","Az","Og","Ol","Lr"],months:["Urtarrila","Otsaila","Martxoa","Apirila","Maiatza","Ekaina","Uztaila","Abuztua","Iraila","Urria","Azaroa","Abendua"],monthsShort:["Urt","Ots","Mar","Api","Mai","Eka","Uzt","Abu","Ira","Urr","Aza","Abe"],today:"Gaur",monthsTitle:"Hilabeteak",clear:"Ezabatu",weekStart:1,format:"yyyy/mm/dd"}}(jQuery);
+!function(a){a.fn.datepicker.dates.eu={days:["Igandea","Astelehena","Asteartea","Asteazkena","Osteguna","Ostirala","Larunbata"],daysShort:["Ig","Al","Ar","Az","Og","Ol","Lr"],daysMin:["Ig","Al","Ar","Az","Og","Ol","Lr"],months:["Urtarrila","Otsaila","Martxoa","Apirila","Maiatza","Ekaina","Uztaila","Abuztua","Iraila","Urria","Azaroa","Abendua"],monthsShort:["Urt","Ots","Mar","Api","Mai","Eka","Uzt","Abu","Ira","Urr","Aza","Abe"],today:"Gaur"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.hy.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.hy={days:["Կիրակի","Երկուշաբթի","Երեքշաբթի","Չորեքշաբթի","Հինգշաբթի","Ուրբաթ","Շաբաթ"],daysShort:["Կրկ","Երկ","Երք","Չրք","Հնգ","Ուր","Շբթ"],daysMin:["Կրկ","Երկ","Երք","Չրք","Հնգ","Ուր","Շբթ"],months:["Հունվար","Փետրվար","Մարտ","Ապրիլ","Մայիս","Հունիս","Հուլիս","Օգոստոս","Սեպտեմբեր","Հոկտեմբեր","Նոյեմբեր","Դեկտեմբեր"],monthsShort:["Հուն","Փետ","Մար","Ապր","Մայ","Հնս","Հլս","Օգս","Սեպ","Հոկ","Նմբ","Դեկ"],today:"Այսօր",clear:"Ջնջել",format:"dd.mm.yyyy",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ka.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.ka={days:["კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი"],daysShort:["კვი","ორშ","სამ","ოთხ","ხუთ","პარ","შაბ"],daysMin:["კვ","ორ","სა","ოთ","ხუ","პა","შა"],months:["იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი","ივლისი","აგვისტო","სექტემბერი","ოქტომბერი","ნოემბერი","დეკემბერი"],monthsShort:["იან","თებ","მარ","აპრ","მაი","ივნ","ივლ","აგვ","სექ","ოქტ","ნოე","დეკ"],today:"დღეს",clear:"გასუფთავება",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);
+!function(a){a.fn.datepicker.dates.ka={days:["კვირა","ორშაბათი","სამშაბათი","ოთხშაბათი","ხუთშაბათი","პარასკევი","შაბათი"],daysShort:["კვი","ორშ","სამ","ოთხ","ხუთ","პარ","შაბ"],daysMin:["კვ","ორ","სა","ოთ","ხუ","პა","შა"],months:["იანვარი","თებერვალი","მარტი","აპრილი","მაისი","ივნისი","ივლისი","აგვისტო","სექტემბერი","ოქტომები","ნოემბერი","დეკემბერი"],monthsShort:["იან","თებ","მარ","აპრ","მაი","ივნ","ივლ","აგვ","სექ","ოქტ","ნოე","დეკ"],today:"დღეს",clear:"გასუფთავება",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.kh.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.kh={days:["អាទិត្យ","ចន្ទ","អង្គារ","ពុធ","ព្រហស្បតិ៍","សុក្រ","សៅរ៍","អាទិត្យ"],daysShort:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍","អា.ទិ"],daysMin:["អា.ទិ","ចន្ទ","អង្គារ","ពុធ","ព្រ.ហ","សុក្រ","សៅរ៍","អា.ទិ"],months:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],monthsShort:["មករា","កុម្ភះ","មិនា","មេសា","ឧសភា","មិថុនា","កក្កដា","សីហា","កញ្ញា","តុលា","វិច្ឆិកា","ធ្នូ"],today:"ថ្ងៃនេះ",clear:"សំអាត"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.kr.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.kr={days:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],daysShort:["일","월","화","수","목","금","토"],daysMin:["일","월","화","수","목","금","토"],months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthsShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"]},a.fn.datepicker.deprecated('The language code "kr" is deprecated and will be removed in 2.0. For korean support use "ko" instead.')}(jQuery);
+!function(a){a.fn.datepicker.dates.kr={days:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],daysShort:["일","월","화","수","목","금","토"],daysMin:["일","월","화","수","목","금","토"],months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthsShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"]}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.lv.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.lv={days:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"],daysShort:["Sv","P","O","T","C","Pk","S"],daysMin:["Sv","Pr","Ot","Tr","Ce","Pk","Se"],months:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],monthsTitle:"Mēneši",today:"Šodien",clear:"Nodzēst",weekStart:1}}(jQuery);
+!function(a){a.fn.datepicker.dates.lv={days:["Svētdiena","Pirmdiena","Otrdiena","Trešdiena","Ceturtdiena","Piektdiena","Sestdiena"],daysShort:["Sv","P","O","T","C","Pk","S"],daysMin:["Sv","Pr","Ot","Tr","Ce","Pk","Se"],months:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],today:"Šodien",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.nb.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.nb={days:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],daysShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],daysMin:["Sø","Ma","Ti","On","To","Fr","Lø"],months:["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Des"],today:"I Dag",format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.no.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.no={days:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],daysShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],daysMin:["Sø","Ma","Ti","On","To","Fr","Lø"],months:["Januar","Februar","Mars","April","Mai","Juni","Juli","August","September","Oktober","November","Desember"],monthsShort:["Jan","Feb","Mar","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Des"],today:"I dag",clear:"Nullstill",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.pl.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.pl={days:["niedziela","poniedziałek","wtorek","środa","czwartek","piątek","sobota"],daysShort:["niedz.","pon.","wt.","śr.","czw.","piąt.","sob."],daysMin:["ndz.","pn.","wt.","śr.","czw.","pt.","sob."],months:["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"],monthsShort:["sty.","lut.","mar.","kwi.","maj","cze.","lip.","sie.","wrz.","paź.","lis.","gru."],today:"dzisiaj",weekStart:1,clear:"wyczyść",format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ro.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.ro={days:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],daysShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],daysMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthsShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],today:"Astăzi",clear:"Șterge",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);
+!function(a){a.fn.datepicker.dates.ro={days:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],daysShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],daysMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],months:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthsShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],today:"Astăzi",clear:"Șterge",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.rs-latin.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates["rs-latin"]={days:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sre","Čet","Pet","Sub"],daysMin:["N","Po","U","Sr","Č","Pe","Su"],months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danas",weekStart:1,format:"dd.mm.yyyy"},a.fn.datepicker.deprecated('This language code "rs-latin" is deprecated (invalid serbian language code) and will be removed in 2.0. For Serbian latin support use "sr-latin" instead.')}(jQuery);
+!function(a){a.fn.datepicker.dates["rs-latin"]={days:["Nedelja","Ponedeljak","Utorak","Sreda","Četvrtak","Petak","Subota"],daysShort:["Ned","Pon","Uto","Sre","Čet","Pet","Sub"],daysMin:["N","Po","U","Sr","Č","Pe","Su"],months:["Januar","Februar","Mart","April","Maj","Jun","Jul","Avgust","Septembar","Oktobar","Novembar","Decembar"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danas",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.rs.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.rs={days:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],daysShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],daysMin:["Н","По","У","Ср","Ч","Пе","Су"],months:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthsShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],today:"Данас",weekStart:1,format:"dd.mm.yyyy"},a.fn.datepicker.deprecated('This language code "rs" is deprecated (invalid serbian language code) and will be removed in 2.0. For Serbian support use "sr" instead.')}(jQuery);
+!function(a){a.fn.datepicker.dates.rs={days:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],daysShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],daysMin:["Н","По","У","Ср","Ч","Пе","Су"],months:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthsShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],today:"Данас",weekStart:1,format:"dd.mm.yyyy"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.ru.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.ru={days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],daysShort:["Вск","Пнд","Втр","Срд","Чтв","Птн","Суб"],daysMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthsShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],today:"Сегодня",clear:"Очистить",format:"dd.mm.yyyy",weekStart:1,monthsTitle:"Месяцы"}}(jQuery);
+!function(a){a.fn.datepicker.dates.ru={days:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],daysShort:["Вск","Пнд","Втр","Срд","Чтв","Птн","Суб"],daysMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthsShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],today:"Сегодня",clear:"Очистить",format:"dd.mm.yyyy",weekStart:1}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.sl.min.js

@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.sl={days:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],daysShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],daysMin:["Ne","Po","To","Sr","Če","Pe","So"],months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danes",weekStart:1}}(jQuery);
+!function(a){a.fn.datepicker.dates.sl={days:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],daysShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],daysMin:["Ne","Po","To","Sr","Če","Pe","So"],months:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],today:"Danes"}}(jQuery);

inst/www/shared/datepicker/js/locales/bootstrap-datepicker.sv.min.js

@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.sv={days:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"],daysShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],daysMin:["Sö","Må","Ti","On","To","Fr","Lö"],months:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],monthsShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],today:"Idag",format:"yyyy-mm-dd",weekStart:1,clear:"Rensa"}}(jQuery);